diff --git a/BPASmartClient.AGV/AGVHelper.cs b/BPASmartClient.AGV/AGVHelper.cs
index ca56e07e..95be2611 100644
--- a/BPASmartClient.AGV/AGVHelper.cs
+++ b/BPASmartClient.AGV/AGVHelper.cs
@@ -471,7 +471,7 @@ namespace BPASmartClient.AGV
             httpJobData.autoUnload = Convert.ToBoolean(config.AppSettings.Settings["autoUnload"].Value); //是否自动下料 true:自动下料  false:人工下料
             httpJobData.enableIOUnload = Convert.ToBoolean(config.AppSettings.Settings["enableIOUnload"].Value); ;//下料交互方式 false:接口交互  true:光电交互
             httpJobData.loadEquipmentId = 5;
-            httpJobData.unloadEquipmentId = 4;
+            httpJobData.unloadEquipmentId = 40;
             httpModel.jobData = httpJobData;
             string body = "["+JsonConvert.SerializeObject(httpModel)+"]";
             //货位到货位
@@ -526,7 +526,7 @@ namespace BPASmartClient.AGV
             httpJobData.autoUnload = Convert.ToBoolean(config.AppSettings.Settings["autoUnload"].Value); //是否自动下料 true:自动下料  false:人工下料
             httpJobData.enableIOUnload = Convert.ToBoolean(config.AppSettings.Settings["enableIOUnload"].Value); ;//下料交互方式 false:接口交互  true:光电交互
             httpJobData.loadEquipmentId = 6;
-            httpJobData.unloadEquipmentId = 4;
+            httpJobData.unloadEquipmentId = 41;
             httpModel.jobData = httpJobData;
             string body ="["+ JsonConvert.SerializeObject(httpModel)+"]";
             //货位到货位
@@ -581,7 +581,7 @@ namespace BPASmartClient.AGV
             httpJobData.autoUnload = Convert.ToBoolean(config.AppSettings.Settings["autoUnload"].Value); //是否自动下料 true:自动下料  false:人工下料
             httpJobData.enableIOUnload = Convert.ToBoolean(config.AppSettings.Settings["enableIOUnload"].Value); ;//下料交互方式 false:接口交互  true:光电交互
             httpJobData.loadEquipmentId = 7;
-            httpJobData.unloadEquipmentId = 4;
+            httpJobData.unloadEquipmentId = 42;
             httpModel.jobData = httpJobData;
             string body ="["+ JsonConvert.SerializeObject(httpModel)+"]";
             //货位到货位
@@ -636,7 +636,7 @@ namespace BPASmartClient.AGV
             httpJobData.autoUnload = Convert.ToBoolean(config.AppSettings.Settings["autoUnload"].Value); //是否自动下料 true:自动下料  false:人工下料
             httpJobData.enableIOUnload = Convert.ToBoolean(config.AppSettings.Settings["enableIOUnload"].Value); ;//下料交互方式 false:接口交互  true:光电交互
             httpJobData.loadEquipmentId = 8;
-            httpJobData.unloadEquipmentId = 4;
+            httpJobData.unloadEquipmentId = 40;
             httpModel.jobData = httpJobData;
             string body = "["+JsonConvert.SerializeObject(httpModel)+"]";
             //货位到货位
@@ -691,7 +691,7 @@ namespace BPASmartClient.AGV
             httpJobData.autoUnload = Convert.ToBoolean(config.AppSettings.Settings["autoUnload"].Value); //是否自动下料 true:自动下料  false:人工下料
             httpJobData.enableIOUnload = Convert.ToBoolean(config.AppSettings.Settings["enableIOUnload"].Value); ;//下料交互方式 false:接口交互  true:光电交互
             httpJobData.loadEquipmentId = 9;
-            httpJobData.unloadEquipmentId = 4;
+            httpJobData.unloadEquipmentId = 41;
             httpModel.jobData = httpJobData;
             string body = "["+JsonConvert.SerializeObject(httpModel)+"]";
             //货位到货位
diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
index e1325b1a..f0688f09 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs
@@ -66,15 +66,23 @@ namespace BPASmartClient.CustomResource.Pages.Model
         {
             lock (runLock)
             {
-                RunLog runLog = new RunLog()
+                try
                 {
-                    Date = DateTime.Now.ToString("yyyy-MM-dd"),
-                    Time = DateTime.Now.ToString("HH:mm:ss"),
-                    RunLogInfo = info
-                };
-                Sqlite<RunLog>.GetInstance.Base.Add(runLog);
-                Application.Current.Dispatcher.Invoke(new Action(() => { runLogs.Insert(0, runLog); }));
-                RunLog?.Invoke(info);
+                    RunLog runLog = new RunLog()
+                    {
+                        Date = DateTime.Now.ToString("yyyy-MM-dd"),
+                        Time = DateTime.Now.ToString("HH:mm:ss"),
+                        RunLogInfo = info
+                    };
+                    Sqlite<RunLog>.GetInstance.Base.Add(runLog);
+                    Application.Current.Dispatcher.Invoke(new Action(() => { runLogs.Insert(0, runLog); }));
+                    RunLog?.Invoke(info);
+                }
+                catch (Exception)
+                {
+
+                   // throw;
+                }
             }
         }
 
diff --git a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
index ef67919e..e265a036 100644
--- a/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/RunLogView.xaml
@@ -263,7 +263,8 @@
                                     Margin="10,0,0,0"
                                     HorizontalAlignment="Left"
                                     Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding RunLogInfo}" />
+                                    Text="{Binding RunLogInfo}"
+                                    TextWrapping="Wrap"/>
 
                                 <Border
                                     Grid.ColumnSpan="6"
diff --git a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
index 43bdbfbe..94b69fe5 100644
--- a/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/UserLogView.xaml
@@ -417,7 +417,9 @@
                                     Margin="10,0,0,0"
                                     HorizontalAlignment="Left"
                                     Style="{StaticResource DataTextBlockStyle}"
-                                    Text="{Binding LogInfo}" />
+                                    Text="{Binding LogInfo}"
+                                    TextWrapping="Wrap"
+                                    />
 
                                 <Border
                                     Grid.ColumnSpan="6"
diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs
index d0d1c0c0..85faa469 100644
--- a/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs
+++ b/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs
@@ -105,38 +105,38 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
                     }
                 }
 
-                //分配后的权限
-                if (res.permission == Enums.Permission.管理员)
-                {
-                    foreach (var items in MenuManage.GetInstance.menuModels)
-                    {
-                        items.MainMenuVisibility = Visibility.Visible;
-                        foreach (var item in items.subMenumodels)
-                        {
-                            item.SubMenuVisibility = Visibility.Visible;
-                        }
-                    }
-                }
-                else
-                {
-                    if (res.userTreeViewModels != null)
-                    {
-                        if (res.userTreeViewModels.Count > 0)
-                        {
-                            foreach (var items in MenuManage.GetInstance.menuModels)
-                            {
-                                foreach (var item in items.subMenumodels)
-                                {
-                                    items.MainMenuVisibility = Visibility.Visible;
-                                    if (res.userTreeViewModels.FirstOrDefault(p => p.Name == item.SubMenuName) != null)
-                                    {
-                                        item.SubMenuVisibility = Visibility.Visible;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+                ////分配后的权限
+                //if (res.permission == Enums.Permission.管理员)
+                //{
+                //    foreach (var items in MenuManage.GetInstance.menuModels)
+                //    {
+                //        items.MainMenuVisibility = Visibility.Visible;
+                //        foreach (var item in items.subMenumodels)
+                //        {
+                //            item.SubMenuVisibility = Visibility.Visible;
+                //        }
+                //    }
+                //}
+                //else
+                //{
+                //    if (res.userTreeViewModels != null)
+                //    {
+                //        if (res.userTreeViewModels.Count > 0)
+                //        {
+                //            foreach (var items in MenuManage.GetInstance.menuModels)
+                //            {
+                //                foreach (var item in items.subMenumodels)
+                //                {
+                //                    items.MainMenuVisibility = Visibility.Visible;
+                //                    if (res.userTreeViewModels.FirstOrDefault(p => p.Name == item.SubMenuName) != null)
+                //                    {
+                //                        item.SubMenuVisibility = Visibility.Visible;
+                //                    }
+                //                }
+                //            }
+                //        }
+                //    }
+                //}
 
 
                 ActionManage.GetInstance.Send("PermissionChange");
diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs
index e2d6bde9..a1a4ddf9 100644
--- a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs
+++ b/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs
@@ -20,6 +20,40 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
         public MainViewModel()
         {
             NavChangedCommand = new RelayCommand<object>(DoNavChanged);
+          BPASmartClient.Message.  MessageLog.GetInstance.InfoNotify = new Action<string>((o) =>
+          {
+              Application.Current?.Dispatcher?.Invoke(() =>
+              {
+                  //ff20aefe
+                  var temp = new MessageModel()
+                  {
+                      LogInfo = o,
+                      Forground = new SolidColorBrush(Color.FromArgb(255, 32, 174, 254))
+                  };
+                  if (DebugLogViewModel.MessageModels.Count > 0)
+                      DebugLogViewModel.MessageModels.Insert(0, temp);
+                  else
+                      DebugLogViewModel.MessageModels.Add(temp);
+              });
+          });
+
+            BPASmartClient.Message.MessageLog.GetInstance.ExInfoNotify = new Action<string>((o) =>
+            {
+                Application.Current?.Dispatcher?.Invoke(() =>
+                {
+                    //FFF53F62
+                    var temp = new MessageModel()
+                    {
+                        LogInfo = o,
+                        Forground = new SolidColorBrush(Color.FromArgb(255, 245, 63, 98))
+                    };
+                    if (DebugLogViewModel.MessageModels.Count > 0)
+                        DebugLogViewModel.MessageModels.Insert(0, temp);
+                    else
+                        DebugLogViewModel.MessageModels.Add(temp);
+                });
+            });
+
             BPA.Helper.MessageLog.GetInstance.NotifyShow = new Action<string>((o) =>
             {
                 Application.Current?.Dispatcher?.Invoke(() =>
diff --git a/BPASmartClient.Helper/Json.cs b/BPASmartClient.Helper/Json.cs
index e20bdb75..c9950a08 100644
--- a/BPASmartClient.Helper/Json.cs
+++ b/BPASmartClient.Helper/Json.cs
@@ -22,6 +22,8 @@ namespace BPASmartClient.Helper
 
         public static T Data { get; set; } = new T();
 
+
+
         /// <summary>
         /// 保存数据
         /// </summary>
@@ -36,12 +38,14 @@ namespace BPASmartClient.Helper
         /// </summary>
         public static void Read()
         {
-            if (File.Exists(path))
-            {
-                string JsonString = File.ReadAllText(path);
-                var result = JsonConvert.DeserializeObject<T>(JsonString);
-                if (result != null) { Data = result; }
-            }
+            
+                if (File.Exists(path))
+                {
+                    string JsonString = File.ReadAllText(path);
+                    var result = JsonConvert.DeserializeObject<T>(JsonString);
+                    if (result != null) { Data = result; }
+                } 
+         
         }
 
         /// <summary>
diff --git a/BPASmartClient.HubHelper/HubHelper.cs b/BPASmartClient.HubHelper/HubHelper.cs
index a687570a..7ae097ae 100644
--- a/BPASmartClient.HubHelper/HubHelper.cs
+++ b/BPASmartClient.HubHelper/HubHelper.cs
@@ -19,7 +19,6 @@ namespace BPASmartClient.HubHelper
         public void Connect(string ip, int port)
         {
             hubConnection = new HubConnectionBuilder().WithAutomaticReconnect().WithUrl($"http://{ip}:{port}/personhub").Build();//连接
-
             hubConnection.On<object>("Report", (s) => { Report?.Invoke(s); });//客户端注册方法
 
             hubConnection.On<object>("Upstreamrequest", (s) => { Upstreamrequest?.Invoke(s); });//客户端注册方法
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index aa438a47..c658c57b 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -28,9 +28,9 @@ namespace BPASmartClient.JXJFoodSmallStation
             base.OnStartup(e);
             MenuInit();
             DataInit();
-            DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
-            ProcessControl.GetInstance.Init();
+            //DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
             MainView mv = new MainView();
+            ProcessControl.GetInstance.Init();
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
             if (res != null && res == true)
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index b18f23db..1e4164dd 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -38,7 +38,7 @@ namespace BPASmartClient.Modbus
 
         public Action Disconnect { get; set; }
 
-        public bool IsReconnect { get; set; } = true; //true=启用重连，false=禁用重连
+        public bool IsReconnect { get; set; } = false; //true=启用重连，false=禁用重连
 
         /// <summary>
         /// 判断是否连接成功
@@ -430,7 +430,7 @@ namespace BPASmartClient.Modbus
                 {
                     commandType = CommandType.Inputs;
                 }
-                Show?.Invoke($"成功，地址：{address}，值：{value}");
+                //Show?.Invoke($"成功，地址：{address}，值：{value}");
                 return true;
             }
             catch (Exception ex)
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 3b9a58cf..dbe281db 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -96,19 +96,19 @@ namespace BPASmartClient.DosingSystem
 
             ParSet.Add(new SubMenumodel()
             {
-                SubMenuName = "设备控制参数设置",
+                SubMenuName = "设备参数设置",
                 SubMenuPermission = new Permission[] { Permission.管理员 },
                 AssemblyName = "BPASmartClient.DosingSystem",
                 ToggleWindowPath = "View.CommParSetView"
             });
 
-            ParSet.Add(new SubMenumodel()
-            {
-                SubMenuName = "出料口管理设置",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.DosingSystem",
-                ToggleWindowPath = "View.OutletManagementView"
-            });
+            //ParSet.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "出料口管理设置",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.DosingSystem",
+            //    ToggleWindowPath = "View.OutletManagementView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
@@ -186,13 +186,13 @@ namespace BPASmartClient.DosingSystem
                 ToggleWindowPath = "Pages.View.DebugLogView"
             });
 
-            InfoLog.Add(new SubMenumodel()
-            {
-                SubMenuName = "报表数据",
-                SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
-                AssemblyName = "BPASmartClient.CustomResource",
-                ToggleWindowPath = "Pages.View.ReportView"
-            });
+            //InfoLog.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "报表数据",
+            //    SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.技术员 },
+            //    AssemblyName = "BPASmartClient.CustomResource",
+            //    ToggleWindowPath = "Pages.View.ReportView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
@@ -255,13 +255,13 @@ namespace BPASmartClient.DosingSystem
                 ToggleWindowPath = "Pages.View.UserManagerView"
             });
 
-            UserManager.Add(new SubMenumodel()
-            {
-                SubMenuName = "NFC登录管理",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.CustomResource",
-                ToggleWindowPath = "Pages.View.NfcSetView"
-            });
+            //UserManager.Add(new SubMenumodel()
+            //{
+            //    SubMenuName = "NFC登录管理",
+            //    SubMenuPermission = new Permission[] { Permission.管理员 },
+            //    AssemblyName = "BPASmartClient.CustomResource",
+            //    ToggleWindowPath = "Pages.View.NfcSetView"
+            //});
 
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index 93cd452e..869cb80f 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -114,7 +114,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/RecipeSettingsView.xaml b/DosingSystem/View/RecipeSettingsView.xaml
index ad1c0c0c..e2e81dc2 100644
--- a/DosingSystem/View/RecipeSettingsView.xaml
+++ b/DosingSystem/View/RecipeSettingsView.xaml
@@ -65,14 +65,14 @@
                 IcoText="&#xe626;"
                 Style="{StaticResource IcoButtonStyle}" />-->
 
-            <Button
+            <!--<Button
                 Width="140"
                 Height="30"
                 Margin="10 0"
                 Command="{Binding NewMaterital}"
                 Content="新建原料"
                 FontSize="16"
-                Style="{StaticResource ImageButtonStyle}" />
+                Style="{StaticResource ImageButtonStyle}" />-->
 
             <Button
                 Width="140"
diff --git a/FryPot_DosingSystem/App.xaml.cs b/FryPot_DosingSystem/App.xaml.cs
index 14d92d8f..2e98296f 100644
--- a/FryPot_DosingSystem/App.xaml.cs
+++ b/FryPot_DosingSystem/App.xaml.cs
@@ -51,7 +51,7 @@ namespace FryPot_DosingSystem
                 //开启实时PLC数据读取
                DosingLogicControl logigControl = DosingLogicControl.GetInstance;//开启逻辑控制任务程序
                 AlarmHelper<AlarmInfo>.Init();//报警实时监控
-                HubHelper.GetInstance.Connect("172.16.12.100", 8089);
+               Task.Run(()=> { HubHelper.GetInstance.Connect("172.16.12.100", 8089); });
 
             }
             else
@@ -164,7 +164,7 @@ namespace FryPot_DosingSystem
             ParamSet.Add(new SubMenumodel()
             {
                 SubMenuName = "PLC变量配置",
-                SubMenuPermission = new Permission[] { Permission.管理员, Permission.技术员 },
+                SubMenuPermission = new Permission[] { Permission.技术员 },
                 AssemblyName = "BPASmartClient.CustomResource",
                 ToggleWindowPath = "Pages.View.VariableConfigView"
             });
@@ -204,7 +204,7 @@ namespace FryPot_DosingSystem
             });
             DeviceMonitor.Add(new SubMenumodel()
             {
-                SubMenuName = "炒锅状态数据监控",
+                SubMenuName = "炒锅状态数据",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.操作员, Permission.技术员, Permission.观察员 },
                 AssemblyName = "FryPot_DosingSystem",
                 ToggleWindowPath = "View.FryPotMonitorView"
@@ -253,13 +253,13 @@ namespace FryPot_DosingSystem
                 AssemblyName = "BPASmartClient.CustomResource",
                 ToggleWindowPath = "Pages.View.UserManageView"
             });
-            UserManager.Add(new SubMenumodel()
-            {
-                SubMenuName = "NFC登录设置",
-                SubMenuPermission = new Permission[] { Permission.管理员 },
-                AssemblyName = "BPASmartClient.CustomResource",
-                ToggleWindowPath = "Pages.View.NfcSetView"
-            });
+            //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;",
@@ -269,11 +269,11 @@ namespace FryPot_DosingSystem
                 subMenumodels = UserManager,
             });
             #endregion
-            #region 调试界面
+            #region 手动控制界面
             ObservableCollection<SubMenumodel> DebugManage = new ObservableCollection<SubMenumodel>();
             DebugManage.Add(new SubMenumodel()
             {
-                SubMenuName = "单一流程调试",
+                SubMenuName = "手动控制",
                 SubMenuPermission = new Permission[] { Permission.管理员, Permission.技术员 },
                 AssemblyName = "FryPot_DosingSystem",
                 ToggleWindowPath = "View.DebugView"
@@ -282,7 +282,7 @@ namespace FryPot_DosingSystem
             MenuManage.GetInstance.menuModels.Add(new MenuModel()
             {
                 MainMenuIcon = "&#xe683;",
-                MainMenuName = "调试界面",
+                MainMenuName = "操作界面",
                 Alias = "Debug Management",
                 MainMenuPermission = new Permission[] { Permission.管理员, Permission.技术员 },
                 subMenumodels = DebugManage,
@@ -291,7 +291,7 @@ namespace FryPot_DosingSystem
         }
         private void LoginDataInite()
         {
-            //Config.GetInstance.Init();//用户数据初始化
+            Config.GetInstance.Init();//用户数据初始化
             Json<RecipeManage>.Read();
         }
     }
diff --git a/FryPot_DosingSystem/Control/DeviceOperate.cs b/FryPot_DosingSystem/Control/DeviceOperate.cs
index 5f86e0e3..08d7086b 100644
--- a/FryPot_DosingSystem/Control/DeviceOperate.cs
+++ b/FryPot_DosingSystem/Control/DeviceOperate.cs
@@ -140,21 +140,56 @@ namespace FryPot_DosingSystem.Control
                 IsConfig = false;
                 MessageNotify.GetInstance.ShowRunLog("PLC变量配置加载失败：文件无数据，请重新配置并重启软件");
             }
-            //Variables.Add(new PlcVariableModel() { Address = "D2001", Length = 8 });//1号线体滚筒工位号
-            //Variables.Add(new PlcVariableModel() { Address = "D2011", Length = 8 });//2号线体滚筒工位号
-            //Variables.Add(new PlcVariableModel() { Address = "D2021", Length = 8 });//3号线体滚筒工位号
-            //Variables.Add(new PlcVariableModel() { Address = "D2031", Length = 9 });//输送线出料状态
-            //Variables.Add(new PlcVariableModel() { Address = "D2040", Length = 5 });//炒锅1-5进料滚筒运行
-            //Variables.Add(new PlcVariableModel() { Address = "D2045", Length = 5 });//炒锅1-5进料到位信号
-            //Variables.Add(new PlcVariableModel() { Address = "D2050", Length = 5 });//炒锅1-5空桶到位信号
-            //Variables.Add(new PlcVariableModel() { Address = "D2055", Length = 5 });//炒锅1-5空桶呼叫AGV
-            //Variables.Add(new PlcVariableModel() { Address = "D2060", Length = 5 });//炒锅1空桶洗桶呼叫AGV
-            //Variables.Add(new PlcVariableModel() { Address = "D2065", Length = 5 });//炒锅1-5空桶滚筒运行
-            //Variables.Add(new PlcVariableModel() { Address = "D2070", Length = 5 });//炒锅1-5滚筒故障信号
-            //Variables.Add(new PlcVariableModel() { Address = "D2075", Length = 1 });//洗桶进桶滚筒运行信号
-            //Variables.Add(new PlcVariableModel() { Address = "D2076", Length = 1 });//洗桶出桶呼叫AGV
-            //Variables.Add(new PlcVariableModel() { Address = "D2077", Length = 1 });// 洗桶出桶滚筒运行信号
-            //Variables.Add(new PlcVariableModel() { Address = "D2078", Length = 3 });//1-3滚筒线体配方完成信号
+            //消息注册
+            modbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryOneModbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryTwoModbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryThreeModbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryFourModbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryFiveModbus.ShowEx += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+
+            modbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryOneModbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryTwoModbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryThreeModbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryFourModbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
+            fryFiveModbus.Show += new Action<string>((s) =>
+            {
+                if (s != null) MessageNotify.GetInstance.ShowRunLog(s);
+            });
         }
         public void Connect()
         {
@@ -176,17 +211,28 @@ namespace FryPot_DosingSystem.Control
                             string DeviceName = devices.Devices[i].DeviceName;
                             switch (DeviceName)
                             {
-                                case "滚筒输送线": modbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("滚筒线PLC连接成功");  break;
-                                case "炒锅1": fryOneModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("1号炒锅PLC连接成功"); break;
-                                case "炒锅2": fryTwoModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("2号炒锅PLC连接成功"); break;
-                                case "炒锅3": fryThreeModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("3号炒锅PLC连接成功"); break;
-                                case "炒锅4": fryFourModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("4号炒锅PLC连接成功"); break;
-                                case "炒锅5": fryFiveModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); MessageNotify.GetInstance.ShowRunLog("5号炒锅PLC连接成功"); break;
+                                case "滚筒输送线": modbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port));   break;
+                                case "炒锅1": fryOneModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); break;
+                                case "炒锅2": fryTwoModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port));  break;
+                                case "炒锅3": fryThreeModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port));  break;
+                                case "炒锅4": fryFourModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port)); break;
+                                case "炒锅5": fryFiveModbus.ModbusTcpConnect(Ip, Convert.ToInt32(Port));  break;
                             }
 
                         }
 
-
+                        if (modbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("滚筒线PLC连接成功");
+                        if (fryOneModbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("1号炒锅PLC连接成功");
+                        if (fryTwoModbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("2号炒锅PLC连接成功");
+                        if (fryThreeModbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("3号炒锅PLC连接成功");
+                        if (fryFourModbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("4号炒锅PLC连接成功");
+                        if (fryFiveModbus.Connected)
+                            MessageNotify.GetInstance.ShowRunLog("5号炒锅PLC连接成功");
                     }
                 }
             }
@@ -198,30 +244,39 @@ namespace FryPot_DosingSystem.Control
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                    {
                        //滚筒线
-                       Connected = modbus.Connected;
-                       if (Connected)
+                       try
                        {
-                           foreach (var item in Variables)
+                           Connected = modbus.Connected;
+                           if (Connected)
                            {
-                               var res = modbus.Read(item.Address, item.Length);//读取plc数据
-                               if (Data.ContainsKey(item.Address))
-                               {
-                                   Data[item.Address] = res;
-                               }
-                               else
+                               foreach (var item in Variables)
                                {
-                                   Data.TryAdd(item.Address, res);
+                                   var res = modbus.Read(item.Address, item.Length);//读取plc数据
+                                   if (Data.ContainsKey(item.Address))
+                                   {
+                                       Data[item.Address] = res;
+                                   }
+                                   else
+                                   {
+                                       Data.TryAdd(item.Address, res);
+                                   }
                                }
-                           }
 
 
+                           }
+                           else
+                           {
+                               DeviceManage devices = Json<DeviceManage>.Data;
+                               var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "滚筒输送线");
+                               if (res != null)
+                                   modbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
+                               Thread.Sleep(10000);
+                           }
                        }
-                       else
+                       catch (Exception)
                        {
-                           DeviceManage devices = Json<DeviceManage>.Data;
-                           var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "滚筒输送线");
-                           if (res != null)
-                               modbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("滚筒线PLC重连成功");
+
+                         //  throw;
                        }
                        Thread.Sleep(10);
                    }), $"滚筒线实时数据读取线程");
@@ -231,151 +286,195 @@ namespace FryPot_DosingSystem.Control
 
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                 {
-                    //炒锅1
-                    FryOneConnected = fryOneModbus.Connected;
-                    if (FryOneConnected)
+                    try
                     {
-                        foreach (var item in FryOneVariables)
+                        //炒锅1
+                        FryOneConnected = fryOneModbus.Connected;
+                        if (FryOneConnected)
                         {
-                            var res = fryOneModbus.Read(item.Address, item.Length);//读取plc数据
-                            if (FryOneData.ContainsKey(item.Address))
+                            foreach (var item in FryOneVariables)
                             {
-                                FryOneData[item.Address] = res;
-                            }
-                            else
-                            {
-                                FryOneData.TryAdd(item.Address, res);
+                                var res = fryOneModbus.Read(item.Address, item.Length);//读取plc数据
+                                if (FryOneData.ContainsKey(item.Address))
+                                {
+                                    FryOneData[item.Address] = res;
+                                }
+                                else
+                                {
+                                    FryOneData.TryAdd(item.Address, res);
+                                }
                             }
+                            //Thread.Sleep(50);
+
                         }
-                        //Thread.Sleep(50);
+                        else
+                        {
+                            DeviceManage devices = Json<DeviceManage>.Data;
+                            var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅1");
+                            if (res != null)
+                                fryOneModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
 
+                            Thread.Sleep(10000);
+                        }
                     }
-                    else
+                    catch (Exception)
                     {
-                        DeviceManage devices = Json<DeviceManage>.Data;
-                        var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅1");
-                        if (res != null)
-                            fryOneModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("1号炒锅PLC重连成功");
+
+                        //throw;
                     }
                     Thread.Sleep(10);
                 }), $"炒锅1实时数据读取线程");
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                     {
-                        //炒锅2
-                        FryTwoConnected = fryTwoModbus.Connected;
-                        if (FryTwoConnected)
+                        try
                         {
-                            foreach (var item in FryTwoVariables)
+                            //炒锅2
+                            FryTwoConnected = fryTwoModbus.Connected;
+                            if (FryTwoConnected)
                             {
-                                var res = fryTwoModbus.Read(item.Address, item.Length);//读取plc数据
-                                if (FryTwoData.ContainsKey(item.Address))
+                                foreach (var item in FryTwoVariables)
                                 {
-                                    FryTwoData[item.Address] = res;
-                                }
-                                else
-                                {
-                                    FryTwoData.TryAdd(item.Address, res);
+                                    var res = fryTwoModbus.Read(item.Address, item.Length);//读取plc数据
+                                    if (FryTwoData.ContainsKey(item.Address))
+                                    {
+                                        FryTwoData[item.Address] = res;
+                                    }
+                                    else
+                                    {
+                                        FryTwoData.TryAdd(item.Address, res);
+                                    }
                                 }
                             }
-
-
+                            else
+                            {
+                                DeviceManage devices = Json<DeviceManage>.Data;
+                                var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅2");
+                                if (res != null)
+                                    fryTwoModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
+                                Thread.Sleep(10000);
+                            }
                         }
-                        else
+                        catch (Exception)
                         {
-                            DeviceManage devices = Json<DeviceManage>.Data;
-                            var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅2");
-                            if (res != null)
-                                fryTwoModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("2号炒锅PLC重连成功");
+
+                            //throw;
                         }
                         Thread.Sleep(10);
                     }), $"炒锅2实时数据读取线程");
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                     {
                         //炒锅3
-                        FryThreeConnected = fryThreeModbus.Connected;
-                        if (FryThreeConnected)
+                        try
                         {
-                            foreach (var item in FryThreeVariables)
+                            FryThreeConnected = fryThreeModbus.Connected;
+                            if (FryThreeConnected)
                             {
-                                var res = fryThreeModbus.Read(item.Address, item.Length);//读取plc数据
-                                if (FryThreeData.ContainsKey(item.Address))
-                                {
-                                    FryThreeData[item.Address] = res;
-                                }
-                                else
+                                foreach (var item in FryThreeVariables)
                                 {
-                                    FryThreeData.TryAdd(item.Address, res);
+                                    var res = fryThreeModbus.Read(item.Address, item.Length);//读取plc数据
+                                    if (FryThreeData.ContainsKey(item.Address))
+                                    {
+                                        FryThreeData[item.Address] = res;
+                                    }
+                                    else
+                                    {
+                                        FryThreeData.TryAdd(item.Address, res);
+                                    }
                                 }
-                            }
-                            //Thread.Sleep(50);
+                                //Thread.Sleep(50);
 
+                            }
+                            else
+                            {
+                                DeviceManage devices = Json<DeviceManage>.Data;
+                                var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅3");
+                                if (res != null)
+                                    fryThreeModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
+                                Thread.Sleep(10000);
+                            }
                         }
-                        else
+                        catch (Exception)
                         {
-                            DeviceManage devices = Json<DeviceManage>.Data;
-                            var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅3");
-                            if (res != null)
-                                fryThreeModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("3号炒锅PLC重连成功");
+
+                            //throw;
                         }
                         Thread.Sleep(10);
                     }), $"炒锅3实时数据读取线程");
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                     {
-                        //炒锅4
-                        FryFourConnected = fryFourModbus.Connected;
-                        if (FryFourConnected)
+                        try
                         {
-                            foreach (var item in FryFourVariables)
+                            //炒锅4
+                            FryFourConnected = fryFourModbus.Connected;
+                            if (FryFourConnected)
                             {
-                                var res = fryFourModbus.Read(item.Address, item.Length);//读取plc数据
-                                if (FryFourData.ContainsKey(item.Address))
-                                {
-                                    FryFourData[item.Address] = res;
-                                }
-                                else
+                                foreach (var item in FryFourVariables)
                                 {
-                                    FryFourData.TryAdd(item.Address, res);
+                                    var res = fryFourModbus.Read(item.Address, item.Length);//读取plc数据
+                                    if (FryFourData.ContainsKey(item.Address))
+                                    {
+                                        FryFourData[item.Address] = res;
+                                    }
+                                    else
+                                    {
+                                        FryFourData.TryAdd(item.Address, res);
+                                    }
                                 }
-                            }
-                            //Thread.Sleep(50);
+                                //Thread.Sleep(50);
 
+                            }
+                            else
+                            {
+                                DeviceManage devices = Json<DeviceManage>.Data;
+                                var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅4");
+                                if (res != null)
+                                    fryFourModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
+                                Thread.Sleep(10000);
+                            }
                         }
-                        else
+                        catch (Exception)
                         {
-                            DeviceManage devices = Json<DeviceManage>.Data;
-                            var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅4");
-                            if (res != null)
-                                fryFourModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("4号炒锅PLC重连成功");
+
+                            //throw;
                         }
                         Thread.Sleep(10);
                     }), $"炒锅4实时数据读取线程");
                 ThreadManage.GetInstance().StartLong(new Action(() =>
                     {
-                        //炒锅5
-                        FryFiveConnected = fryFiveModbus.Connected;
-                        if (FryFiveConnected)
+                        try
                         {
-                            foreach (var item in FryFiveVariables)
+                            //炒锅5
+                            FryFiveConnected = fryFiveModbus.Connected;
+                            if (FryFiveConnected)
                             {
-                                var res = fryFiveModbus.Read(item.Address, item.Length);//读取plc数据
-                                if (FryFiveData.ContainsKey(item.Address))
-                                {
-                                    FryFiveData[item.Address] = res;
-                                }
-                                else
+                                foreach (var item in FryFiveVariables)
                                 {
-                                    FryFiveData.TryAdd(item.Address, res);
+                                    var res = fryFiveModbus.Read(item.Address, item.Length);//读取plc数据
+                                    if (FryFiveData.ContainsKey(item.Address))
+                                    {
+                                        FryFiveData[item.Address] = res;
+                                    }
+                                    else
+                                    {
+                                        FryFiveData.TryAdd(item.Address, res);
+                                    }
                                 }
-                            }
-                            // Thread.Sleep(50);
+                                // Thread.Sleep(50);
 
+                            }
+                            else
+                            {
+                                DeviceManage devices = Json<DeviceManage>.Data;
+                                var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅5");
+                                if (res != null)
+                                    fryFiveModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port));
+                                Thread.Sleep(10000);
+                            }
                         }
-                        else
+                        catch (Exception)
                         {
-                            DeviceManage devices = Json<DeviceManage>.Data;
-                            var res = devices.Devices.FirstOrDefault(p => p.DeviceName == "炒锅5");
-                            if (res != null)
-                                fryFiveModbus.ModbusTcpConnect(res.Ip, Convert.ToInt32(res.Port)); MessageNotify.GetInstance.ShowRunLog("5号炒锅PLC重连成功");
+
+                           // throw;
                         }
                         Thread.Sleep(10);
                     }), $"炒锅5实时数据读取线程");
@@ -414,6 +513,16 @@ namespace FryPot_DosingSystem.Control
         {
             fryOneModbus.Write(address,value);
         }
+        /// <summary>
+        /// 炒锅1工艺目标重量偏差
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        public void WritePotOneRealPlcData(string address, float value)
+        {
+            fryOneModbus.SetReal(address, value);
+        }
+
         /// <summary>
         /// 炒锅2工艺数据
         /// </summary>
@@ -425,6 +534,15 @@ namespace FryPot_DosingSystem.Control
 
         }
         /// <summary>
+        /// 炒锅2工艺目标重量偏差
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        public void WritePotTwoRealPlcData(string address, float value)
+        {
+            fryTwoModbus.SetReal(address, value);
+        }
+        /// <summary>
         /// 炒锅3工艺数据
         /// </summary>
         /// <param name="address"></param>
@@ -435,6 +553,15 @@ namespace FryPot_DosingSystem.Control
 
         }
         /// <summary>
+        /// 炒锅3工艺目标重量偏差
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        public void WritePotThreeRealPlcData(string address, float value)
+        {
+            fryThreeModbus.SetReal(address, value);
+        }
+        /// <summary>
         /// 炒锅4工艺数据
         /// </summary>
         /// <param name="address"></param>
@@ -445,6 +572,15 @@ namespace FryPot_DosingSystem.Control
             fryFourModbus.Write(address,value);
         }
         /// <summary>
+        /// 炒锅4工艺目标重量偏差
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        public void WritePotFourRealPlcData(string address, float value)
+        {
+            fryFourModbus.SetReal(address, value);
+        }
+        /// <summary>
         /// 炒锅5工艺数据
         /// </summary>
         /// <param name="address"></param>
@@ -454,6 +590,15 @@ namespace FryPot_DosingSystem.Control
             fryFiveModbus.Write(address, value);
 
         }
+        /// <summary>
+        /// 炒锅5工艺目标重量偏差
+        /// </summary>
+        /// <param name="address"></param>
+        /// <param name="value"></param>
+        public void WritePotFiveRealPlcData(string address, float value)
+        {
+            fryFiveModbus.SetReal(address, value);
+        }
         public ConcurrentDictionary<string, object> GetAllData()
         {
             return Data;
diff --git a/FryPot_DosingSystem/Control/DosingLogicControl.cs b/FryPot_DosingSystem/Control/DosingLogicControl.cs
index 31f08fed..86b63b7d 100644
--- a/FryPot_DosingSystem/Control/DosingLogicControl.cs
+++ b/FryPot_DosingSystem/Control/DosingLogicControl.cs
@@ -24,6 +24,7 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Diagnostics;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.CustomResource.UserControls;
+using Renci.SshNet.Messages;
 
 namespace FryPot_DosingSystem.Control
 {
@@ -162,6 +163,17 @@ namespace FryPot_DosingSystem.Control
         private static readonly object Pot_Lock = new object();//炒股工艺工艺下发锁
         public int CleanNum = 0;//当前清洗台桶数
 
+        ushort LOneCurrentRollerNum = 0;//当前线体1的空桶桶号
+        ushort LTwoCurrentRollerNum = 0;//当前线体2的空桶桶号
+        ushort LThreeCurrentRollerNum = 0;//当前线体3的空桶桶号
+
+
+        public NewRecipeModel potOneCurrentRecipe = null;
+        public NewRecipeModel potTwoCurrentRecipe = null;
+        public NewRecipeModel potThreeCurrentRecipe = null;
+        public NewRecipeModel potFourCurrentRecipe = null;
+        public NewRecipeModel potFiveCurrentRecipe = null;
+
         #endregion
         /// <summary>
         /// 调试命令注册
@@ -185,145 +197,131 @@ namespace FryPot_DosingSystem.Control
                 globalVar.agvArriveLineThreeLoadEmptyRoller = true;
 
             }), "AgvArriveLineThreeEmptyRollerLoc");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.CleanComplete = 1;
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.CleanComplete = 1;
 
-            }), "CleanPlateCallAgv");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineOne.agvArriveCleanUnLoad = true;//清洗台空桶下料就位
-                globalVar.rollerLineTwo.agvArriveCleanUnLoad = true;
-                globalVar.rollerLineThree.agvArriveCleanUnLoad = true;
+            //}), "CleanPlateCallAgv");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineOne.agvArriveCleanUnLoad = true;//清洗台空桶下料就位
+            //    globalVar.rollerLineTwo.agvArriveCleanUnLoad = true;
+            //    globalVar.rollerLineThree.agvArriveCleanUnLoad = true;
 
-            }), "AgvArriveCleanPlateLoc");
+            //}), "AgvArriveCleanPlateLoc");
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 globalVar.agvArriveCleanLoad = true;//清洗台空桶上料就位
 
             }), "AgvArriveCleanPlateLocLoad");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.agvArriveLineFour = true;
-                globalVar.rollerLineOne.agvArriveLineFour = true;
-                globalVar.rollerLineTwo.agvArriveLineFour = true;
-                globalVar.rollerLineThree.agvArriveLineFour = true;
-            }), "AgvArriveLineFourLoc");
-
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                LineOneEmptyRollerCleanTaskRestart();
-
-            }), "EmptyRollerCleanTaskRestart");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                LineTwoEmptyRollerCleanTaskRestart();
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.agvArriveLineFour = true;
+            //    globalVar.rollerLineOne.agvArriveLineFour = true;
+            //    globalVar.rollerLineTwo.agvArriveLineFour = true;
+            //    globalVar.rollerLineThree.agvArriveLineFour = true;
+            //}), "AgvArriveLineFourLoc");
 
-            }), "LineTwoEmptyRollerCleanTaskRestart");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                LineThreeEmptyRollerCleanTaskRestart();
 
-            }), "LineThreeEmptyRollerCleanTaskRestart");
             #endregion
             //接口调试
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                string id = Guid.NewGuid().ToString("D");
-                string errorCode = AGVHelper.GetInstance.AgvToLineOneLoadRoller(id);
-                if (errorCode == "SUCCESS")
-                {
-                    MessageNotify.GetInstance.ShowRunLog($"AGV任务下发成功");
-                }
-                else if (errorCode == "Analysis Error")
-                {
-                    MessageNotify.GetInstance.ShowRunLog($"提示：AGV 调用API失败，请检查请求报文");
-                }
-                else
-                {
-                    MessageNotify.GetInstance.ShowRunLog($"提示：AGV任务下发失败，错误码:{errorCode}");
-                }
-            }), "AgvDebug");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    string id = Guid.NewGuid().ToString("D");
+            //    string errorCode = AGVHelper.GetInstance.AgvToLineOneLoadRoller(id);
+            //    if (errorCode == "SUCCESS")
+            //    {
+            //        MessageNotify.GetInstance.ShowRunLog($"AGV任务下发成功");
+            //    }
+            //    else if (errorCode == "Analysis Error")
+            //    {
+            //        MessageNotify.GetInstance.ShowRunLog($"提示：AGV 调用API失败，请检查请求报文");
+            //    }
+            //    else
+            //    {
+            //        MessageNotify.GetInstance.ShowRunLog($"提示：AGV任务下发失败，错误码:{errorCode}");
+            //    }
+            //}), "AgvDebug");
 
-            ActionManage.GetInstance.Register(() =>
-            {
-                MessageNotify.GetInstance.ShowRunLog("清洗台卸桶完成");
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    MessageNotify.GetInstance.ShowRunLog("清洗台卸桶完成");
 
-            }, "AgvArriveCleanPlateLocCom");
+            //}, "AgvArriveCleanPlateLocCom");
 
-            ActionManage.GetInstance.Register(() =>
-            {
-                MessageNotify.GetInstance.ShowRunLog("清洗台空桶在【4】号线卸桶完成");
-                MessageNotify.GetInstance.ShowRunLog("【1】号线炒锅空桶在【4】号线卸桶完成");
-                MessageNotify.GetInstance.ShowRunLog("【2】号线炒锅空桶在【4】号线卸桶完成");
-                MessageNotify.GetInstance.ShowRunLog("【3】号线炒锅空桶在【4】号线卸桶完成");
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    MessageNotify.GetInstance.ShowRunLog("清洗台空桶在【4】号线卸桶完成");
+            //    MessageNotify.GetInstance.ShowRunLog("【1】号线炒锅空桶在【4】号线卸桶完成");
+            //    MessageNotify.GetInstance.ShowRunLog("【2】号线炒锅空桶在【4】号线卸桶完成");
+            //    MessageNotify.GetInstance.ShowRunLog("【3】号线炒锅空桶在【4】号线卸桶完成");
 
-            }, "AgvArriveLineFourLocCom");
-            ActionManage.GetInstance.Register(() =>
-            {
-                MessageNotify.GetInstance.ShowRunLog("清洗台空桶装载完成");
+            //}, "AgvArriveLineFourLocCom");
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    MessageNotify.GetInstance.ShowRunLog("清洗台空桶装载完成");
 
-            }, "AgvArriveCleanPlateLocLoadCom");
+            //}, "AgvArriveCleanPlateLocLoadCom");
 
-            ActionManage.GetInstance.Register(() =>
-            {
-                // globalVar.rollerLineOne.RecipeCompleteSingle = 1;
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    // globalVar.rollerLineOne.RecipeCompleteSingle = 1;
 
-            }, "LineOneRecipeComSignal");
-            ActionManage.GetInstance.Register(() =>
-            {
-                //  globalVar.rollerLineTwo.RecipeCompleteSingle = 1;
+            //}, "LineOneRecipeComSignal");
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    //  globalVar.rollerLineTwo.RecipeCompleteSingle = 1;
 
-            }, "LineTwoRecipeComSignal");
-            ActionManage.GetInstance.Register(() =>
-            {
-                // globalVar.rollerLineThree.RecipeCompleteSingle = 1;
+            //}, "LineTwoRecipeComSignal");
+            //ActionManage.GetInstance.Register(() =>
+            //{
+            //    // globalVar.rollerLineThree.RecipeCompleteSingle = 1;
 
-            }, "LineThreeRecipeComSignal");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.agvArriveLineOneLoadCom = true;
-            }), "AgvLineOneLoadEmptyCom");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.agvArriveLineTwoLoadCom = true;
-            }), "AgvLineTwoLoadEmptyCom");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.agvArriveLineThreeLoadCom = true;
-            }), "AgvLineThreeLoadEmptyCom");
+            //}, "LineThreeRecipeComSignal");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.agvArriveLineOneLoadCom = true;
+            //}), "AgvLineOneLoadEmptyCom");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.agvArriveLineTwoLoadCom = true;
+            //}), "AgvLineTwoLoadEmptyCom");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.agvArriveLineThreeLoadCom = true;
+            //}), "AgvLineThreeLoadEmptyCom");
 
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineOne.CanRun = true;
-            }), "AGVLineOneLoadCom");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineTwo.CanRun = true;
-            }), "AGVLineTwoLoadCom");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineThree.CanRun = true;
-            }), "AGVLineThreeLoadCom");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineOne.CanRun = true;
+            //}), "AGVLineOneLoadCom");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineTwo.CanRun = true;
+            //}), "AGVLineTwoLoadCom");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineThree.CanRun = true;
+            //}), "AGVLineThreeLoadCom");
 
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineOne.OutMaterialingSingle = 1;
-            }), "RollerLineRunning");
-            ActionManage.GetInstance.Register(new Action<object>((obj) =>
-            {
-                globalVar.rollerLineOne.StationEight = (ushort)obj;
-            }), "EightWorkLoc");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotOne.InputMaterialArrivedSingle = 1;
-                globalVar.fryPotFour.InputMaterialArrivedSingle = 1;
-            }), "FryPotInputArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotOne.EmptyBarrelArrivedSingle = 1;
-                globalVar.fryPotFour.EmptyBarrelArrivedSingle = 1;
-            }), "FryPotEmptyRollerArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineOne.OutMaterialingSingle = 1;
+            //}), "RollerLineRunning");
+            //ActionManage.GetInstance.Register(new Action<object>((obj) =>
+            //{
+            //    globalVar.rollerLineOne.StationEight = (ushort)obj;
+            //}), "EightWorkLoc");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotOne.InputMaterialArrivedSingle = 1;
+            //    globalVar.fryPotFour.InputMaterialArrivedSingle = 1;
+            //}), "FryPotInputArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotOne.EmptyBarrelArrivedSingle = 1;
+            //    globalVar.fryPotFour.EmptyBarrelArrivedSingle = 1;
+            //}), "FryPotEmptyRollerArrive");
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 globalVar.agvArriveUpLoad = true;
@@ -336,30 +334,30 @@ namespace FryPot_DosingSystem.Control
             {
                 globalVar.agvArriveUpLoad = true;
             }), "AGVFryPotUpArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.agvFryPotEmptyRollerArrive = true;
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.agvFryPotEmptyRollerArrive = true;
 
-            }), "AGVFryPotGetEmptyRoller");
+            //}), "AGVFryPotGetEmptyRoller");
             //滚筒线2
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineTwo.OutMaterialingSingle = 1;
-            }), "RollerLineTwoRunning");
-            ActionManage.GetInstance.Register(new Action<object>((obj) =>
-            {
-                globalVar.rollerLineTwo.StationEight = (ushort)obj;
-            }), "TwoEightWorkLoc");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotTwo.InputMaterialArrivedSingle = 1;
-                globalVar.fryPotFive.InputMaterialArrivedSingle = 1;
-            }), "FryPotTwoInputArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotTwo.EmptyBarrelArrivedSingle = 1;
-                globalVar.fryPotFive.EmptyBarrelArrivedSingle = 1;
-            }), "FryPotTwoEmptyRollerArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineTwo.OutMaterialingSingle = 1;
+            //}), "RollerLineTwoRunning");
+            //ActionManage.GetInstance.Register(new Action<object>((obj) =>
+            //{
+            //    globalVar.rollerLineTwo.StationEight = (ushort)obj;
+            //}), "TwoEightWorkLoc");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotTwo.InputMaterialArrivedSingle = 1;
+            //    globalVar.fryPotFive.InputMaterialArrivedSingle = 1;
+            //}), "FryPotTwoInputArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotTwo.EmptyBarrelArrivedSingle = 1;
+            //    globalVar.fryPotFive.EmptyBarrelArrivedSingle = 1;
+            //}), "FryPotTwoEmptyRollerArrive");
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 globalVar.agvArriveLTwoUpLoad = true;
@@ -372,28 +370,28 @@ namespace FryPot_DosingSystem.Control
             {
                 globalVar.agvArriveLTwoUpLoad = true;
             }), "AGVFryPotTwoUpArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.LTwoagvFryPotEmptyRollerArrive = true;
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.LTwoagvFryPotEmptyRollerArrive = true;
 
-            }), "AGVFryPotTwoGetEmptyRoller");
+            //}), "AGVFryPotTwoGetEmptyRoller");
             //滚筒线3
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.rollerLineThree.OutMaterialingSingle = 1;
-            }), "RollerLineThreeRunning");
-            ActionManage.GetInstance.Register(new Action<object>((obj) =>
-            {
-                globalVar.rollerLineThree.StationEight = (ushort)obj;
-            }), "ThreeEightWorkLoc");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotThree.InputMaterialArrivedSingle = 1;
-            }), "FryPotThreeInputArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.fryPotThree.EmptyBarrelArrivedSingle = 1;
-            }), "FryPotThreeEmptyRollerArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.rollerLineThree.OutMaterialingSingle = 1;
+            //}), "RollerLineThreeRunning");
+            //ActionManage.GetInstance.Register(new Action<object>((obj) =>
+            //{
+            //    globalVar.rollerLineThree.StationEight = (ushort)obj;
+            //}), "ThreeEightWorkLoc");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotThree.InputMaterialArrivedSingle = 1;
+            //}), "FryPotThreeInputArrive");
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.fryPotThree.EmptyBarrelArrivedSingle = 1;
+            //}), "FryPotThreeEmptyRollerArrive");
             ActionManage.GetInstance.Register(new Action(() =>
             {
                 globalVar.agvArriveLThreeUpLoad = true;
@@ -406,11 +404,11 @@ namespace FryPot_DosingSystem.Control
             {
                 globalVar.agvArriveLThreeUpLoad = true;
             }), "AGVFryPotThreeUpArrive");
-            ActionManage.GetInstance.Register(new Action(() =>
-            {
-                globalVar.LThreeagvFryPotEmptyRollerArrive = true;
+            //ActionManage.GetInstance.Register(new Action(() =>
+            //{
+            //    globalVar.LThreeagvFryPotEmptyRollerArrive = true;
 
-            }), "AGVFryPotThreeGetEmptyRoller");
+            //}), "AGVFryPotThreeGetEmptyRoller");
         }
         public DosingLogicControl()
         {
@@ -433,14 +431,35 @@ namespace FryPot_DosingSystem.Control
             ActionManage.GetInstance.Register(new Action(() => { globalVar.ExitLineOneTask = true; LineOneTaskRestart(); }), "LineOneTaskExit");
             ActionManage.GetInstance.Register(new Action(() => { globalVar.ExitLineTwoTask = true; LineTwoTaskRestart(); }), "LineTwoTaskExit");
             ActionManage.GetInstance.Register(new Action(() => { globalVar.ExitLineThreeTask = true; LineThreeTaskRestart(); }), "LineThreeTaskExit");
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                globalVar.ExitLineOneTask = true;
+                LineOneEmptyRollerCleanTaskRestart();
+
+            }), "EmptyRollerCleanTaskRestart");
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                globalVar.ExitLineTwoTask = true;
+                LineTwoEmptyRollerCleanTaskRestart();
+
+            }), "LineTwoEmptyRollerCleanTaskRestart");
+            ActionManage.GetInstance.Register(new Action(() =>
+            {
+                globalVar.ExitLineThreeTask = true;
+                LineThreeEmptyRollerCleanTaskRestart();
+
+            }), "LineThreeEmptyRollerCleanTaskRestart");
             HubHelper.GetInstance.Report = new Action<object>(AgvTaskUpReportDataAnalysis);
             HubHelper.GetInstance.Upstreamrequest = new Action<object>(AgvFeedBackUpReportDataAnalysis);
             //ResetProgram();
             ReadPlcData();
+
             SaveFryPotData();
             MainTask();
-            // CommandRegist();
+            CommandRegist();
         }
+
+
         /// <summary>
         /// 文件数据定期清理
         /// </summary>
@@ -699,8 +718,7 @@ namespace FryPot_DosingSystem.Control
                 }
             }
         }
-        int cout = 0;
-        int cout1 = 0;
+
         /// <summary>
         /// AGV上下料上报数据解析
         /// </summary>
@@ -719,32 +737,34 @@ namespace FryPot_DosingSystem.Control
                 if (objData.equipmentId == 1 && objData.command == "LOAD")//同一任务号且处于上料阶段，AGV请求上料
                 {
                     globalVar.agvArriveUpLoad = true;//AGV到达上料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【1】号滚筒线上料请求");
                 }
                 if ((objData.equipmentId == 5 || objData.equipmentId == 8) && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.agvArriveUnLoad = true;//AGV到达下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【{globalVar.LOneFryPotSerial}】号炒锅下料请求");
                 }
                 //线体2请求上下料
                 if (objData.equipmentId == 2 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLTwoUpLoad = true;//AGV到达上料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【2】号滚筒线上料请求");
                 }
                 if ((objData.equipmentId == 6 || objData.equipmentId == 9) && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.LTwoagvArriveUnLoad = true;//AGV到达下料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【{globalVar.LTwoFryPotSerial}】号炒锅下料请求");
                 }
                 //线体3请求上下料
                 if (objData.equipmentId == 3 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLThreeUpLoad = true;//AGV到达上料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【3】号滚筒线上料请求");
                 }
                 if (objData.equipmentId == 7 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.LThreeagvArriveUnLoad = true;//AGV到达下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【{globalVar.LThreeFryPotSerial}】号炒锅下料请求");
                 }
                 #endregion
                 #region 炒锅到线体4请求上下料
@@ -752,39 +772,39 @@ namespace FryPot_DosingSystem.Control
                 if ((objData.equipmentId == 5 || objData.equipmentId == 8) && objData.command == "LOAD")//同一任务号且处于上料阶段，AGV请求上料
                 {
                     globalVar.agvArriveUpLoad = true;//AGV到达上料位置
-                    MessageNotify.GetInstance.ShowRunLog($"AGV到达【{globalVar.LOneFryPotSerial}】号炒锅空桶上料位置");
+                    MessageNotify.GetInstance.ShowRunLog($"编号【{objData.agvCode}】AGV到达【{globalVar.LOneFryPotSerial}】号炒锅空桶上料位置");
                     AgvArriveFryPotOneOrFourOutEmptyRollerSingleSetDown();//发送AGV到位信号
                 }
-                if (objData.equipmentId == 4 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
+                if (objData.equipmentId == 40 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.rollerLineOne.agvArriveLineFour = true;//AGV到达下料位置
-                                                                     //AgvViewModel.GetInstance().Set滚筒线状态(4, IsRun.Start);
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV回桶下料请求");
                 }
                 //炒锅2,5到线体4
                 if ((objData.equipmentId == 6 || objData.equipmentId == 9) && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLTwoUpLoad = true;//AGV到达上料位置
-                    MessageNotify.GetInstance.ShowRunLog($"AGV到达【{globalVar.LTwoFryPotSerial}】号炒锅空桶上料位置");
+                    MessageNotify.GetInstance.ShowRunLog($"编号【{objData.agvCode}】AGV到达【{globalVar.LTwoFryPotSerial}】号炒锅空桶上料位置");
                     AgvArriveFryPotTwoOrFiveOutEmptyRollerSingleSetDown();//发送AGV到位信号
 
                 }
-                if (objData.equipmentId == 4 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
+                if (objData.equipmentId == 41 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.rollerLineTwo.agvArriveLineFour = true;//AGV到达下料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV回桶下料请求");
 
                 }
                 //炒锅3到线体4
                 if (objData.equipmentId == 7 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLThreeUpLoad = true;//AGV到达上料位置
-                    MessageNotify.GetInstance.ShowRunLog($"AGV到达【{globalVar.LThreeFryPotSerial}】号炒锅空桶上料位置");
+                    MessageNotify.GetInstance.ShowRunLog($"编号【{objData.agvCode}】AGV到达【{globalVar.LThreeFryPotSerial}】号炒锅空桶上料位置");
                     AgvArriveFryPotThreeOutEmptyRollerSingleSetDown();//发送AGV到位信号
                 }
-                if (objData.equipmentId == 4 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
+                if (objData.equipmentId == 42 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.rollerLineThree.agvArriveLineFour = true;//AGV到达下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV回桶下料请求");
                 }
                 #endregion
                 #region 线体123到清洗台请求上下料
@@ -792,44 +812,49 @@ namespace FryPot_DosingSystem.Control
                 if (objData.equipmentId == 11 && objData.command == "LOAD")//同一任务号且处于上料阶段，AGV请求上料
                 {
                     globalVar.agvArriveLineOneLoadEmptyRoller = true;//AGV到达上料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【1】号滚筒线上料请求");
                 }
                 if (objData.equipmentId == 10 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
                     globalVar.rollerLineOne.agvArriveCleanUnLoad = true;//AGV到达下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV洗桶机下料请求");
                 }
                 //线体2到清洗台
                 if (objData.equipmentId == 22 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLineTwoLoadEmptyRoller = true;//AGV到达上料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【2】号滚筒线上料请求");
 
                 }
                 if (objData.equipmentId == 20 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
 
                     globalVar.rollerLineTwo.agvArriveCleanUnLoad = true;//AGV到达下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV洗桶机下料请求");
                 }
 
                 if (objData.equipmentId == 33 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveLineThreeLoadEmptyRoller = true;//AGV到达上料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV【3】号滚筒线上料请求");
                 }
                 if (objData.equipmentId == 30 && objData.command == "UNLOAD")//同一任务号且处于下料阶段
                 {
 
                     globalVar.rollerLineThree.agvArriveCleanUnLoad = true;//AGV到达下料位置
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV洗桶机下料请求");
                 }
                 #endregion
                 #region 清洗台到线体4请求上下料
                 if (objData.equipmentId == 10 && objData.command == "LOAD")
                 {
                     globalVar.agvArriveCleanLoad = true;//agv到达清洗台上料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV洗桶机上料请求");
                 }
                 if (objData.equipmentId == 44 && objData.command == "UNLOAD")
                 {
                     globalVar.agvArriveLineFour = true;//agv到达线体4下料位置
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.agvCode}】AGV回桶线下料请求");
                 }
                 #endregion
             }
@@ -946,6 +971,7 @@ namespace FryPot_DosingSystem.Control
                     {
                         AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.yc_1_4);
                     }
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体1→炒锅【{globalVar.LOneFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
 
                 //线体2任务上报
@@ -963,7 +989,7 @@ namespace FryPot_DosingSystem.Control
                     {
                         AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.yc_2_5);
                     }
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体2→炒锅【{globalVar.LTwoFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体3任务上报
                 if (objData.state == "LOAD_COMPLETED" && objData.robotJobId == LThreerobotJobId && objData.jobData.startPointCode == "HHif8Z")//指定上料点上料完成，这里指线体上料
@@ -973,7 +999,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set滚筒线上数量(3, (--globalVar.LThreeMaterialNum).ToString());
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.Yes);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.yc_3_3);
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体3→炒锅【{globalVar.LThreeFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体1任务上报
                 if (objData.state == "ROLLER_UNLOAD_DOING" && objData.robotJobId == LOnerobotJobId && (objData.jobData.targetPointCode == "DXDnMJ" || objData.jobData.targetPointCode == "naFssQ"))//指定下料点正在下料，指线体到炒锅下料
@@ -1001,10 +1027,12 @@ namespace FryPot_DosingSystem.Control
                     {
                         DeviceOperate.GetInstance.WritePlcData("D1058", 0);
                     }
+
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.No);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hj);
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LOneFryPotSerial}】下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体2任务上报
                 if (objData.state == "DONE" && objData.robotJobId == LTworobotJobId && (objData.jobData.targetPointCode == "CDPGde" || objData.jobData.targetPointCode == "sxSX88"))//指定下料位置下料完成，指线体到炒锅下料
@@ -1021,6 +1049,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hj);
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LTwoFryPotSerial}】下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体3任务上报
                 if (objData.state == "DONE" && objData.robotJobId == LThreerobotJobId && objData.jobData.targetPointCode == "biZG87")//指定下料位置下料完成，指线体到炒锅下料
@@ -1030,6 +1059,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hj);
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LThreeFryPotSerial}】下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 #endregion
                 #region 炒锅空桶上下料任务信息回报
@@ -1071,6 +1101,7 @@ namespace FryPot_DosingSystem.Control
                     {
                         AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hs_4);
                     }
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LOneFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体2任务上报
                 if (objData.state == "LOAD_COMPLETED" && objData.robotJobId == LFiverobotJobId && (objData.jobData.startPointCode == "CDPGde" || objData.jobData.startPointCode == "sxSX88"))//指定上料点上料完成，这里指炒锅空桶上料
@@ -1095,6 +1126,7 @@ namespace FryPot_DosingSystem.Control
                     {
                         AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hs_5);
                     }
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LTwoFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体3任务上报
                 if (objData.state == "LOAD_COMPLETED" && objData.robotJobId == LSixrobotJobId && objData.jobData.startPointCode == "biZG87")//指定上料点上料完成，这里指炒锅空桶上料
@@ -1103,6 +1135,7 @@ namespace FryPot_DosingSystem.Control
                     globalVar.LThreeagvFryPotEmptyRollerArrive = true;
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.OnllYes);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hs_3);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LThreeFryPotSerial}】上料完成信号，任务号【{objData.robotJobId}】");
                 }
 
 
@@ -1143,7 +1176,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], AgvViewModel.GetInstance().GetCommandValue("hj"));
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV炒锅【{globalVar.LOneFryPotSerial}】→回桶线下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体2任务上报
                 if (objData.state == "DONE" && objData.robotJobId == LFiverobotJobId && objData.jobData.targetPointCode == "w2jZhM")//指定下料位置下料完成，指炒锅空桶下料
@@ -1161,6 +1194,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], AgvViewModel.GetInstance().GetCommandValue("hj"));
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV【{globalVar.LTwoFryPotSerial}】→回桶线下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体3任务上报
                 if (objData.state == "DONE" && objData.robotJobId == LSixrobotJobId && objData.jobData.targetPointCode == "w2jZhM")//指定下料位置下料完成，指炒锅空桶下料
@@ -1178,6 +1212,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], AgvViewModel.GetInstance().GetCommandValue("hj"));
                     AgvViewModel.GetInstance().Set小车停止(agvCode[objData.jobData.agvCode]);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV【{globalVar.LThreeFryPotSerial}】→回桶线下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 #endregion
                 #region 线体123空桶到清戏台
@@ -1190,6 +1225,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.OnllYes);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.tqx_1);
                     //到清洗处
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体1→洗桶机上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体2任务上报
                 if (objData.state == "LOAD_COMPLETED" && LEightrobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.startPointCode == "PChS6R")//指定上料点上料完成，这里指线体2空桶上料
@@ -1200,7 +1236,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.OnllYes);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.tqx_2);
                     //到清洗处
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体2→洗桶机上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 //线体3任务上报
                 if (objData.state == "LOAD_COMPLETED" && LNinerobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.startPointCode == "HHif8Z")//指定上料点上料完成，这里指线体3空桶上料
@@ -1211,7 +1247,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.OnllYes);
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.tqx_3);
                     //到清洗处
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体3→洗桶机上料完成信号，任务号【{objData.robotJobId}】");
                 }
 
 
@@ -1224,6 +1260,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.qxt_hj);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
                     AgvViewModel.GetInstance().SetCleanRollerNum(++CleanNum);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体1→洗桶机下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 if (objData.state == "DONE" && LEightrobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.targetPointCode == "TitRYC")//指定下料位置下料完成，指从线体2到清戏台空桶下料
                 {
@@ -1234,6 +1271,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.qxt_hj);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
                     AgvViewModel.GetInstance().SetCleanRollerNum(++CleanNum);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体2→洗桶机下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 if (objData.state == "DONE" && LNinerobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.targetPointCode == "TitRYC")//指定下料位置下料完成，指从线体3到清戏台空桶下料
                 {
@@ -1244,6 +1282,7 @@ namespace FryPot_DosingSystem.Control
                     AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.qxt_hj);
                     AgvViewModel.GetInstance().Set停车桩(agvCode[objData.jobData.agvCode], IsBool.Yes);
                     AgvViewModel.GetInstance().SetCleanRollerNum(++CleanNum);
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV线体3→洗桶机下料完成信号，任务号【{objData.robotJobId}】");
                 }
                 #endregion
                 #region 清洗台到线体4
@@ -1253,14 +1292,14 @@ namespace FryPot_DosingSystem.Control
                     // globalVar.AllowNextEmptyRollerToClean = true;//AGV到滚筒线搬运空桶的允许标志
                     MessageNotify.GetInstance.ShowRunLog("清洗台空桶装载完成");
                     AgvViewModel.GetInstance().Set小车是否承载物品(agvCode[objData.jobData.agvCode], IsBool.OnllYes);
-                    AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.hs_4);//去四号空桶线
+                    AgvViewModel.GetInstance().Set小车运动(agvCode[objData.jobData.agvCode], CartMotionTrajectory.qxt_4);//去四号空桶线
                     AgvViewModel.GetInstance().SetCleanRollerNum(--CleanNum);
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV洗桶机上料完成信号，任务号【{objData.robotJobId}】");
                 }
                 if (objData.state == "ROLLER_UNLOAD_DOING" && LTenrobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.targetPointCode == "TitRYC")//指定下料点正在下料，指清洗台空桶到线体4下料
                 {
                     AgvViewModel.GetInstance().Set滚筒线状态(4, IsRun.Start);
-
+                    MessageNotify.GetInstance.ShowRunLog($"收到编号【{objData.jobData.agvCode}】AGV回桶线下料完成信号，任务号【{objData.robotJobId}】");
                 }
 
                 if (objData.state == "DONE" && LTenrobotJobId.FirstOrDefault(p => p == objData.robotJobId) != null && objData.jobData.targetPointCode == "w2jZhM")//指定下料位置下料完成，指清戏台空桶到线体4下料
@@ -1349,7 +1388,7 @@ namespace FryPot_DosingSystem.Control
                 globalVar.rollerLineOne.CanRun = true;
 
                 globalVar.ExitLineOneTask = false;
-              
+
                 globalVar.LOneCurrentRecipeName = string.Empty;
 
                 globalVar.AllowAgvToLineLoadRoller = true;
@@ -1362,16 +1401,19 @@ namespace FryPot_DosingSystem.Control
 
                 globalVar.LOneMaterialNum = 0;
                 globalVar.LOneCurrentCookingStep = 0;
+                globalVar.LFourCurrentCookingStep = 0;
 
-                //globalVar.agvArriveUpLoad = false;
-                //globalVar.agvArriveUnLoad = false;
-                //globalVar.agvFryPotEmptyRollerArrive = false;
-                //globalVar.agvLineOneLoadCom = false;
+
+                globalVar.agvArriveUpLoad = false;
+                globalVar.agvArriveUnLoad = false;
+                globalVar.agvFryPotEmptyRollerArrive = false;
+                globalVar.rollerLineOne.agvArriveLineFour = false;
+                globalVar.agvLineOneLoadCom = false;
                 ErrorRecipe = false;
 
                 ThreadManage.GetInstance().StartLong(new Action(() => { LineOneProcessExecute(); Thread.Sleep(10); }), "滚筒线1任务线程");
                 MessageNotify.GetInstance.ShowUserLog("滚筒线【1】任务重启成功");
-              
+
             }));
         }
         public void LineTwoTaskRestart()
@@ -1399,7 +1441,7 @@ namespace FryPot_DosingSystem.Control
 
                 globalVar.AllowAgvToLineTwoLoadRoller = true;
                 globalVar.LTwoInOrOutputLock = false;
-             
+
                 globalVar.LTwoLoadRoller = false;
                 globalVar.LTwoAgvToFryPot = false;
                 globalVar.LTwoPotInputMaterialArrive = false;
@@ -1408,11 +1450,13 @@ namespace FryPot_DosingSystem.Control
 
                 globalVar.LTwoMaterialNum = 0;
                 globalVar.LTwoCurrentCookingStep = 0;
+                globalVar.LFiveCurrentCookingStep = 0;
 
-                //globalVar.agvArriveLTwoUpLoad = false;
-                //globalVar.LTwoagvArriveUnLoad = false;
-                //globalVar.LTwoagvFryPotEmptyRollerArrive = false;
-                //globalVar.agvLineTwoLoadCom = false;
+                globalVar.agvArriveLTwoUpLoad = false;
+                globalVar.LTwoagvArriveUnLoad = false;
+                globalVar.LTwoagvFryPotEmptyRollerArrive = false;
+                globalVar.rollerLineTwo.agvArriveLineFour = false;
+                globalVar.agvLineTwoLoadCom = false;
                 LTwoErrorRecipe = false;
 
                 ThreadManage.GetInstance().StartLong(new Action(() => { LineTwoProcessExecute(); Thread.Sleep(10); }), "滚筒线2任务线程");
@@ -1451,10 +1495,11 @@ namespace FryPot_DosingSystem.Control
                 globalVar.LThreeMaterialNum = 0;
                 globalVar.LThreeCurrentCookingStep = 0;
 
-                //globalVar.agvArriveLThreeUpLoad = false;
-                //globalVar.LThreeagvArriveUnLoad = false;
-                //globalVar.LThreeagvFryPotEmptyRollerArrive = false;
-                //globalVar.agvLineThreeLoadCom = false;
+                globalVar.agvArriveLThreeUpLoad = false;
+                globalVar.LThreeagvArriveUnLoad = false;
+                globalVar.LThreeagvFryPotEmptyRollerArrive = false;
+                globalVar.rollerLineThree.agvArriveLineFour = false;
+                globalVar.agvLineThreeLoadCom = false;
                 LThreeErrorRecipe = false;
                 ThreadManage.GetInstance().StartLong(new Action(() => { LineThreeProcessExecute(); Thread.Sleep(10); }), "滚筒线3任务线程");
                 MessageNotify.GetInstance.ShowUserLog("滚筒线【3】任务重启成功");
@@ -1466,10 +1511,11 @@ namespace FryPot_DosingSystem.Control
             ThreadManage.GetInstance().StopTask("滚筒线1空桶清洗任务线程", new Action(() =>
             {
                 globalVar.rollerLineOne.StationEight = 0;
-                globalVar.rollerLineOne.EmptyRollerNums.Clear();
-               
+                globalVar.ExitLineOneTask = false;
+                //globalVar.rollerLineOne.EmptyRollerNums.Clear();
+
                 globalVar.rollerLineOne.IsEpmtyBefore = false;
-                 globalVar.rollerLineOne.CanRun = true;
+                globalVar.rollerLineOne.CanRun = true;
 
                 globalVar.agvArriveLineFour = false;
                 globalVar.agvArriveCleanLoad = false;
@@ -1488,8 +1534,9 @@ namespace FryPot_DosingSystem.Control
             {
 
                 globalVar.rollerLineTwo.StationEight = 0;
-                globalVar.rollerLineTwo.EmptyRollerNums.Clear();
-              
+                globalVar.ExitLineTwoTask = false;
+                // globalVar.rollerLineTwo.EmptyRollerNums.Clear();
+
                 globalVar.rollerLineTwo.IsEpmtyBefore = false;
                 globalVar.rollerLineTwo.CanRun = true;
 
@@ -1510,8 +1557,9 @@ namespace FryPot_DosingSystem.Control
             ThreadManage.GetInstance().StopTask("滚筒线3空桶清洗任务线程", new Action(() =>
             {
                 globalVar.rollerLineThree.StationEight = 0;
-                globalVar.rollerLineThree.EmptyRollerNums.Clear();
-              
+                globalVar.ExitLineThreeTask = false;
+                //   globalVar.rollerLineThree.EmptyRollerNums.Clear();
+
                 globalVar.rollerLineThree.IsEpmtyBefore = false;
                 globalVar.rollerLineThree.CanRun = true;
 
@@ -1533,36 +1581,69 @@ namespace FryPot_DosingSystem.Control
             {
                 GetAddressData("D2001", new Action<ushort[]>((data) =>
                 {
-                    globalVar.rollerLineOne.StationOne = data[0];
-                    globalVar.rollerLineOne.StationTwo = data[1];
-                    globalVar.rollerLineOne.StationThree = data[2];
-                    globalVar.rollerLineOne.StationFour = data[3];
-                    globalVar.rollerLineOne.StationFive = data[4];
-                    globalVar.rollerLineOne.StationSix = data[5];
-                    globalVar.rollerLineOne.StationSeven = data[6];
-                    globalVar.rollerLineOne.StationEight = data[7];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.rollerLineOne.StationOne = data[0];
+                            globalVar.rollerLineOne.StationTwo = data[1];
+                            globalVar.rollerLineOne.StationThree = data[2];
+                            globalVar.rollerLineOne.StationFour = data[3];
+                            globalVar.rollerLineOne.StationFive = data[4];
+                            globalVar.rollerLineOne.StationSix = data[5];
+                            globalVar.rollerLineOne.StationSeven = data[6];
+                            globalVar.rollerLineOne.StationEight = data[7]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetAddressData("D2011", new Action<ushort[]>((data) =>
                 {
-                    globalVar.rollerLineTwo.StationOne = data[0];
-                    globalVar.rollerLineTwo.StationTwo = data[1];
-                    globalVar.rollerLineTwo.StationThree = data[2];
-                    globalVar.rollerLineTwo.StationFour = data[3];
-                    globalVar.rollerLineTwo.StationFive = data[4];
-                    globalVar.rollerLineTwo.StationSix = data[5];
-                    globalVar.rollerLineTwo.StationSeven = data[6];
-                    globalVar.rollerLineTwo.StationEight = data[7];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.rollerLineTwo.StationOne = data[0];
+                            globalVar.rollerLineTwo.StationTwo = data[1];
+                            globalVar.rollerLineTwo.StationThree = data[2];
+                            globalVar.rollerLineTwo.StationFour = data[3];
+                            globalVar.rollerLineTwo.StationFive = data[4];
+                            globalVar.rollerLineTwo.StationSix = data[5];
+                            globalVar.rollerLineTwo.StationSeven = data[6];
+                            globalVar.rollerLineTwo.StationEight = data[7]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetAddressData("D2021", new Action<ushort[]>((data) =>
                 {
-                    globalVar.rollerLineThree.StationOne = data[0];
-                    globalVar.rollerLineThree.StationTwo = data[1];
-                    globalVar.rollerLineThree.StationThree = data[2];
-                    globalVar.rollerLineThree.StationFour = data[3];
-                    globalVar.rollerLineThree.StationFive = data[4];
-                    globalVar.rollerLineThree.StationSix = data[5];
-                    globalVar.rollerLineThree.StationSeven = data[6];
-                    globalVar.rollerLineThree.StationEight = data[7];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.rollerLineThree.StationOne = data[0];
+                            globalVar.rollerLineThree.StationTwo = data[1];
+                            globalVar.rollerLineThree.StationThree = data[2];
+                            globalVar.rollerLineThree.StationFour = data[3];
+                            globalVar.rollerLineThree.StationFive = data[4];
+                            globalVar.rollerLineThree.StationSix = data[5];
+                            globalVar.rollerLineThree.StationSeven = data[6];
+                            globalVar.rollerLineThree.StationEight = data[7]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetAddressData("D2031", new Action<ushort[]>((data) =>
                 {
@@ -1574,9 +1655,20 @@ namespace FryPot_DosingSystem.Control
                     //AlarmHelper<AlarmInfo>.GetInstance().LineTwoRollerRunning = data[4];
                     //AlarmHelper<AlarmInfo>.GetInstance().LineThreeRollerRunning = data[5];
 
-                    AlarmHelper<AlarmInfo>.GetInstance("1号滚筒线故障").LOneRollerTrouble = data[6];
-                    AlarmHelper<AlarmInfo>.GetInstance("2号滚筒线故障").LTwoRollerTrouble = data[7];
-                    AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble = data[8];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            AlarmHelper<AlarmInfo>.GetInstance("1号滚筒线故障").LOneRollerTrouble = data[6];
+                            AlarmHelper<AlarmInfo>.GetInstance("2号滚筒线故障").LTwoRollerTrouble = data[7];
+                            AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble = data[8]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
 
                 }));
                 //GetAddressData("D2040", new Action<ushort[]>((data) =>
@@ -1596,19 +1688,41 @@ namespace FryPot_DosingSystem.Control
                 //}));
                 GetAddressData("D2045", new Action<ushort[]>((data) =>
                 {
-                    globalVar.fryPotOne.InputMaterialArrivedSingle = data[0];
-                    globalVar.fryPotTwo.InputMaterialArrivedSingle = data[1];
-                    globalVar.fryPotThree.InputMaterialArrivedSingle = data[2];
-                    globalVar.fryPotFour.InputMaterialArrivedSingle = data[3];
-                    globalVar.fryPotFive.InputMaterialArrivedSingle = data[4];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.fryPotOne.InputMaterialArrivedSingle = data[0];
+                            globalVar.fryPotTwo.InputMaterialArrivedSingle = data[1];
+                            globalVar.fryPotThree.InputMaterialArrivedSingle = data[2];
+                            globalVar.fryPotFour.InputMaterialArrivedSingle = data[3];
+                            globalVar.fryPotFive.InputMaterialArrivedSingle = data[4]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetAddressData("D2050", new Action<ushort[]>((data) =>
                 {
-                    globalVar.fryPotOne.EmptyBarrelArrivedSingle = data[0];
-                    globalVar.fryPotTwo.EmptyBarrelArrivedSingle = data[1];
-                    globalVar.fryPotThree.EmptyBarrelArrivedSingle = data[2];
-                    globalVar.fryPotFour.EmptyBarrelArrivedSingle = data[3];
-                    globalVar.fryPotFive.EmptyBarrelArrivedSingle = data[4];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.fryPotOne.EmptyBarrelArrivedSingle = data[0];
+                            globalVar.fryPotTwo.EmptyBarrelArrivedSingle = data[1];
+                            globalVar.fryPotThree.EmptyBarrelArrivedSingle = data[2];
+                            globalVar.fryPotFour.EmptyBarrelArrivedSingle = data[3];
+                            globalVar.fryPotFive.EmptyBarrelArrivedSingle = data[4]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 //GetAddressData("D2065", new Action<ushort[]>((data) =>
                 //{
@@ -1631,11 +1745,22 @@ namespace FryPot_DosingSystem.Control
                     //globalVar.fryPotThree.RollerTroubleSingle = data[2];
                     //globalVar.fryPotFour.RollerTroubleSingle = data[3];
                     //globalVar.fryPotFive.RollerTroubleSingle = data[4];
-                    AlarmHelper<AlarmInfo>.GetInstance("1号炒锅滚筒故障").FryPotOneRollerTrouble = data[0];
-                    AlarmHelper<AlarmInfo>.GetInstance("2号炒锅滚筒故障").FryPotTwoRollerTrouble = data[1];
-                    AlarmHelper<AlarmInfo>.GetInstance("3号炒锅滚筒故障").FryPotThreeRollerTrouble = data[2];
-                    AlarmHelper<AlarmInfo>.GetInstance("4号炒锅滚筒故障").FryPotFourRollerTrouble = data[3];
-                    AlarmHelper<AlarmInfo>.GetInstance("5号炒锅滚筒故障").FryPotFiveRollerTrouble = data[4];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            AlarmHelper<AlarmInfo>.GetInstance("1号炒锅滚筒故障").FryPotOneRollerTrouble = data[0];
+                            AlarmHelper<AlarmInfo>.GetInstance("2号炒锅滚筒故障").FryPotTwoRollerTrouble = data[1];
+                            AlarmHelper<AlarmInfo>.GetInstance("3号炒锅滚筒故障").FryPotThreeRollerTrouble = data[2];
+                            AlarmHelper<AlarmInfo>.GetInstance("4号炒锅滚筒故障").FryPotFourRollerTrouble = data[3];
+                            AlarmHelper<AlarmInfo>.GetInstance("5号炒锅滚筒故障").FryPotFiveRollerTrouble = data[4]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 //GetAddressData("D2078", new Action<ushort[]>(data =>
                 //{
@@ -1645,224 +1770,739 @@ namespace FryPot_DosingSystem.Control
                 //}));
                 GetAddressData("D2075", new Action<ushort[]>(data =>
                 {
-                    AlarmHelper<AlarmInfo>.GetInstance("洗桶机进筒未运行").CleanEnterRollerRunning = data[0];
-                    globalVar.CleadBarrelEnterSingle = data[0];
-                }));
-                GetAddressData("D2076", new Action<ushort[]>(data =>
-                {
-                    globalVar.CleanComplete = data[0];//洗桶出桶agv呼叫信号
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            AlarmHelper<AlarmInfo>.GetInstance("洗桶机进筒未运行").CleanEnterRollerRunning = data[0];
+                            globalVar.CleadBarrelEnterSingle = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
 
+                        // throw;
+                    }
                 }));
-                GetAddressData("D2077", new Action<ushort[]>(data =>
+                GetAddressData("D2076", new Action<ushort[]>(data =>
                 {
-                    AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning = data[0];
-                    globalVar.CleadBarrelExitSingle = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.CleanComplete = data[0];//洗桶出桶agv呼叫信号
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
+
+                }));
+                GetAddressData("D2077", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning = data[0];
+                            globalVar.CleadBarrelExitSingle = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
 
                 //滚筒线123开始信号
                 GetAddressData("D2101", new Action<ushort[]>(data =>
                 {
-                    globalVar.rollerLineOne.ExcuteIsConfirm = data[0];
-                    globalVar.rollerLineTwo.ExcuteIsConfirm = data[1];
-                    globalVar.rollerLineThree.ExcuteIsConfirm = data[2];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.rollerLineOne.ExcuteIsConfirm = data[0];
+                            globalVar.rollerLineTwo.ExcuteIsConfirm = data[1];
+                            globalVar.rollerLineThree.ExcuteIsConfirm = data[2]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetAddressData("D4400", new Action<ushort[]>(data =>
                 {
-                    globalVar.rollerLineOne.EmptyRollerNum = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.rollerLineOne.EmptyRollerNum = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetAddressData("D4410", new Action<ushort[]>(data =>
                 {
-                    globalVar.rollerLineTwo.EmptyRollerNum = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.rollerLineTwo.EmptyRollerNum = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetAddressData("D4420", new Action<ushort[]>(data =>
                 {
-                    globalVar.rollerLineThree.EmptyRollerNum = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.rollerLineThree.EmptyRollerNum = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
 
                 GetAddressData("D2111", new Action<ushort[]>(data =>
                 {
-                    globalVar.rollerLineOne.WashEmptyRollerModel = data[0];
-                    globalVar.rollerLineTwo.WashEmptyRollerModel = data[1];
-                    globalVar.rollerLineThree.WashEmptyRollerModel = data[2];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            globalVar.rollerLineOne.WashEmptyRollerModel = data[0];
+                            globalVar.rollerLineTwo.WashEmptyRollerModel = data[1];
+                            globalVar.rollerLineThree.WashEmptyRollerModel = data[2];
+
+                            globalVar.rollerLineOne.WashRollerArriveSignal = data[3];
+                            globalVar.rollerLineTwo.WashRollerArriveSignal = data[4];
+                            globalVar.rollerLineThree.WashRollerArriveSignal = data[5]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
 
-                    globalVar.rollerLineOne.WashRollerArriveSignal = data[3];
-                    globalVar.rollerLineTwo.WashRollerArriveSignal = data[4];
-                    globalVar.rollerLineThree.WashRollerArriveSignal = data[5];
+                        // throw;
+                    }
                 }));
 
                 //炒锅1状态数据
                 GetFryOneData("D0258", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.Temperature = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.Temperature = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryOneData("D0510", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.SmallFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.SmallFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryOneData("D0512", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.MidFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.MidFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryOneData("D0514", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.BigFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.BigFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryOneData("D0516", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.StrongFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.StrongFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryOneData("D2500", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.Speed = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.Speed = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //  throw;
+                    }
                 }));
                 GetFryOneData("D0600", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.FryPotWeight = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryOne.FryPotWeight = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryOneData("D3000", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryOne.Step = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            FryPotMonitorManage.GetInstance.fryOne.Step = data[0];
+                            globalVar.fryPotOne.ProcessStep = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
+                GetFryOneData("D3301", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.fryPotOne.RecipeCompleteSingle = data[0];
+                    }
+                    catch (Exception)
+                    {
 
+                        //throw;
+                    }
+                }));
                 ////炒锅2状态数据
                 GetFryTwoData("D0258", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.Temperature = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.Temperature = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryTwoData("D0510", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.SmallFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.SmallFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryTwoData("D0512", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.MidFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.MidFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryTwoData("D0514", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.BigFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.BigFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryTwoData("D0516", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.StrongFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.StrongFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryTwoData("D2500", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.Speed = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.Speed = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryTwoData("D0600", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.FryPotWeight = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryTwo.FryPotWeight = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryTwoData("D3000", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryTwo.Step = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            FryPotMonitorManage.GetInstance.fryTwo.Step = data[0];
+                            globalVar.fryPotTwo.ProcessStep = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
+                GetFryTwoData("D3302", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.fryPotTwo.RecipeCompleteSingle = data[0];
+                    }
+                    catch (Exception)
+                    {
 
+                        // throw;
+                    }
+                }));
 
                 ////炒锅3状态数据
                 GetFryThreeData("D0258", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.Temperature = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.Temperature = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryThreeData("D0510", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.SmallFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.SmallFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryThreeData("D0512", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.MidFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.MidFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryThreeData("D0514", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.BigFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.BigFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryThreeData("D0516", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.StrongFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.StrongFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryThreeData("D2500", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.Speed = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.Speed = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryThreeData("D0600", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.FryPotWeight = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryThree.FryPotWeight = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryThreeData("D3000", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryThree.Step = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            FryPotMonitorManage.GetInstance.fryThree.Step = data[0];
+                            globalVar.fryPotThree.ProcessStep = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
+                GetFryThreeData("D3303", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.fryPotThree.RecipeCompleteSingle = data[0];
+                    }
+                    catch (Exception)
+                    {
 
+                        //throw;
+                    }
+                }));
                 //}));
                 ////炒锅4状态数据
                 GetFryFourData("D0258", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.Temperature = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.Temperature = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFourData("D0510", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.SmallFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.SmallFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryFourData("D0512", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.MidFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.MidFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFourData("D0514", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.BigFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.BigFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFourData("D0516", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.StrongFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.StrongFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryFourData("D2500", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.Speed = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.Speed = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //  throw;
+                    }
                 }));
                 GetFryFourData("D0600", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.FryPotWeight = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.FryPotWeight = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFourData("D3000", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.Step = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            FryPotMonitorManage.GetInstance.fryFour.Step = data[0];
+                            globalVar.fryPotFour.ProcessStep = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
+                GetFryFourData("D3304", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if(data.Count()>0)
+                        globalVar.fryPotFour.RecipeCompleteSingle = data[0];
+                    }
+                    catch (Exception)
+                    {
 
+                        //throw;
+                    }
+                }));
                 //}));
                 ////炒锅5状态数据
                 GetFryFiveData("D0258", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.Temperature = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.Temperature = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFiveData("D0510", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.SmallFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.SmallFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryFiveData("D0512", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.MidFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.MidFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFiveData("D0514", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.BigFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.BigFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFiveData("D0516", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.StrongFire = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.StrongFire = data[0];
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFiveData("D2500", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFour.Speed = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFour.Speed = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
                 GetFryFiveData("D0600", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.FryPotWeight = data[0] / 10.0;
+                    try
+                    {
+                        if (data.Count() > 0)
+                            FryPotMonitorManage.GetInstance.fryFive.FryPotWeight = data[0] / 10.0;
+                    }
+                    catch (Exception)
+                    {
+
+                        //throw;
+                    }
                 }));
                 GetFryFiveData("D3000", new Action<ushort[]>(data =>
                 {
-                    FryPotMonitorManage.GetInstance.fryFive.Step = data[0];
+                    try
+                    {
+                        if (data.Count() > 0)
+                        {
+                            FryPotMonitorManage.GetInstance.fryFive.Step = data[0];
+                            globalVar.fryPotFive.ProcessStep = data[0]; 
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                        // throw;
+                    }
                 }));
+                GetFryFiveData("D3305", new Action<ushort[]>(data =>
+                {
+                    try
+                    {
+                        if (data.Count() > 0)
+                            globalVar.fryPotFive.RecipeCompleteSingle = data[0];
+                    }
+                    catch (Exception)
+                    {
 
+                        //throw;
+                    }
+                }));
                 //}));
                 //线体上放空桶
                 if (globalVar.rollerLineOne.EmptyRollerNum != 0)
@@ -1937,6 +2577,9 @@ namespace FryPot_DosingSystem.Control
             }), "MainViewReadPlcData");
 
         }
+
+
+
         /// <summary>
         /// 炒锅状态实时显示
         /// </summary>
@@ -2015,7 +2658,6 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void FryPotDataSaveToBinaryFile()
         {
-
             #region 炒锅1状态数据保存
             if (!Directory.Exists("AccessFile\\" + "DB\\" + "炒锅1状态数据"))
             {
@@ -2378,9 +3020,24 @@ namespace FryPot_DosingSystem.Control
 
             }
 
+        }
+        /// <summary>
+        /// 炒锅写float类型Plc数据
+        /// </summary>
+        public void WritePotRealData(int potNum, string address, float value)
+        {
+            switch (potNum)
+            {
+                case 1: DeviceOperate.GetInstance.WritePotOneRealPlcData(address, value); break;
+                case 2: DeviceOperate.GetInstance.WritePotTwoRealPlcData(address, value); break;
+                case 3: DeviceOperate.GetInstance.WritePotThreeRealPlcData(address, value); break;
+                case 4: DeviceOperate.GetInstance.WritePotFourRealPlcData(address, value); break;
+                case 5: DeviceOperate.GetInstance.WritePotFiveRealPlcData(address, value); break;
+
+            }
+
         }
 
-
         /// <summary>
         /// 配方数据接收
         /// </summary>
@@ -2445,32 +3102,12 @@ namespace FryPot_DosingSystem.Control
 
         }
 
-        ///// <summary>
-        ///// 1号线统一洗桶
-        ///// </summary>
-        //public void LineOneUnifyWashRollerModel()
-        //{
-
-        //}
-        ///// <summary>
-        ///// 2号线统一洗桶
-        ///// </summary>
-        //public void LineTwoUnifyWashRollerModel()
-        //{
-
-        //}
-        ///// <summary>
-        ///// 3号线统一洗桶
-        ///// </summary>
-        //public void LineThreeUnifyWashRollerModel()
-        //{
-
-        //}
         /// <summary>
         /// 线体1的执行流程
         /// </summary>
         public void LineOneProcessExecute()
         {
+            LOneFryPotStepDisplay();
             LOneRecipeDataToPlc();
             LineOneRecipeExecuteConfirm();
             LOneLoadRoller();
@@ -2487,7 +3124,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LineTwoProcessExecute()
         {
-
+            LTwoFryPotStepDisplay();
             LTwoRecipeDataToPlc();
             LineTwoRecipeExecuteConfirm();
             LTwoAgvLoadRoller();
@@ -2504,7 +3141,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LineThreeProcessExecute()
         {
-
+            LThreeFryPotStepDisplay();
             LThreeRecipeDataToPlc();
             LineThreeRecipeExecuteConfirm();
             LThreeAgvLoadRoller();
@@ -2545,27 +3182,29 @@ namespace FryPot_DosingSystem.Control
         }
         private void CleanPlateUpLoad()
         {
-            if (globalVar.agvArriveCleanLoad || globalVar.LineTenRobotTaskError)
+            if (globalVar.agvArriveCleanLoad)
             {
                 globalVar.agvArriveCleanLoad = false;
                 MessageNotify.GetInstance.ShowRunLog("AGV到达清洗台空桶上料位置");
-            erp: if (AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning == 0)
-                {
-                    //plc交互
-                    WritePlcData("D1066", 1);//AGV空桶出桶就位信号下发PlC
+                //plc交互
+                WritePlcData("D1066", 1);//AGV空桶出桶就位信号下发PlC
+                                         //erp: if (AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning == 0)
+                                         //    {
+                                         //        //plc交互
+                                         //        WritePlcData("D1066", 1);//AGV空桶出桶就位信号下发PlC
 
-                }
-                else//有故障
-                {
-                    while (AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning == 1)
-                    {
-                        Thread.Sleep(1000);
-                        if (globalVar.ExitLineOneTask)
-                            return;
-                    }
-                    MessageNotify.GetInstance.ShowRunLog("清洗台空桶出桶滚筒重新运行！！");
-                    goto erp;
-                }
+                //    }
+                //    else//有故障
+                //    {
+                //        while (AlarmHelper<AlarmInfo>.GetInstance("洗桶机出桶未运行").CleanOutputRollerRunning == 1)
+                //        {
+                //            Thread.Sleep(1000);
+                //            if (globalVar.ExitLineOneTask)
+                //                return;
+                //        }
+                //        MessageNotify.GetInstance.ShowRunLog("清洗台空桶出桶滚筒重新运行！！");
+                //        goto erp;
+                //    }
             }
         }
 
@@ -2576,26 +3215,27 @@ namespace FryPot_DosingSystem.Control
         {
             if (AlarmHelper<AlarmInfo>.GetInstance("1号滚筒线故障").LOneRollerTrouble == 0)//输送线无故障
             {
-                if (TTrig.GetInstance("LineOneModel").Start(Convert.ToBoolean(globalVar.rollerLineTwo.WashEmptyRollerModel)))
+                if (TTrig.GetInstance("LineOneModel").Start(Convert.ToBoolean(globalVar.rollerLineOne.WashEmptyRollerModel)))
                 {
                     MessageNotify.GetInstance.ShowRunLog($"1号滚筒线切换为普通洗桶模式");
                 }
 
                 if (globalVar.rollerLineOne.WashEmptyRollerModel == 0)
                 {
-                    
+
                     try
                     {
                         lock (Obj_Lock)
                         {
+
                             //线体1到清洗台
                             if (!globalVar.rollerLineOne.IsEpmtyBefore && globalVar.rollerLineOne.CanRun && globalVar.AllowNextEmptyRollerToClean && globalVar.rollerLineOne.EmptyRollerNums.Count > 0)
                             {
 
                                 var res = InputMaterialQuene.FirstOrDefault(p => p.materialType.MaterialLoc == globalVar.rollerLineOne.StationEight);
-                                if ((globalVar.rollerLineOne.StationEight != 0 && globalVar.rollerLineOne.StationEight == globalVar.rollerLineOne.EmptyRollerNums.ElementAt(0) && InputMaterialQuene.Count > 0 && globalVar.rollerLineOne.StationEight != InputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineOne.StationEight != 0 && globalVar.rollerLineOne.StationEight == globalVar.rollerLineOne.EmptyRollerNums.ElementAt(0)))//一种情况工位8上面有桶且不是配方上的原料桶且工位8的桶号和plc上报的桶号一致,即空桶，另一种在没有下单的情况下，线体上的桶都认为是空桶
+                                if ((globalVar.rollerLineOne.StationEight != 0 && globalVar.rollerLineOne.EmptyRollerNums.Contains(globalVar.rollerLineOne.StationEight) && InputMaterialQuene.Count > 0 && globalVar.rollerLineOne.StationEight != InputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineOne.StationEight != 0 && globalVar.rollerLineOne.EmptyRollerNums.Contains(globalVar.rollerLineOne.StationEight)))//一种情况工位8上面有桶且不是配方上的原料桶且工位8的桶号和plc上报的桶号一致,即空桶，另一种在没有下单的情况下，线体上的桶都认为是空桶
                                 {
-
+                                    LOneCurrentRollerNum = globalVar.rollerLineOne.StationEight;
                                 //下发AGV去空桶线洗桶任务
                                 e: string id = Guid.NewGuid().ToString("D");
                                     if (id == LOnerobotJobId || id == LTworobotJobId || id == LThreerobotJobId || id == LFourrobotJobId || id == LFiverobotJobId || id == LSixrobotJobId || LSevenrobotJobId.FirstOrDefault(p => p == id) != null || LEightrobotJobId.FirstOrDefault(p => p == id) != null || LNinerobotJobId.FirstOrDefault(p => p == id) != null || LTenrobotJobId.FirstOrDefault(p => p == id) != null)
@@ -2606,7 +3246,7 @@ namespace FryPot_DosingSystem.Control
                                     // Thread.Sleep(500);
                                     if (LineToCleanCarryTaskErrorCodeAnalysis(info, 1))//AGV呼叫成功
                                     {
-
+                                        WritePlcData("D1250", LOneCurrentRollerNum);//下发空桶桶号到洗桶机
                                         globalVar.rollerLineOne.IsEpmtyBefore = true;
                                         globalVar.AllowNextEmptyRollerToClean = false;
                                     }
@@ -2621,7 +3261,7 @@ namespace FryPot_DosingSystem.Control
                             }
                             else
                             {
-                                AgvFromLineOneToClean(globalVar.rollerLineOne.EmptyRollerNums.ElementAt(0));//AGV从线体1到清洗处
+                                AgvFromLineOneToClean(LOneCurrentRollerNum);//AGV从线体1到清洗处
                             }
                         }
                     }
@@ -2686,7 +3326,7 @@ namespace FryPot_DosingSystem.Control
                 }
                 if (globalVar.rollerLineTwo.WashEmptyRollerModel == 0)
                 {
-                  
+
                     try
                     {
                         lock (Obj_Lock)
@@ -2695,8 +3335,9 @@ namespace FryPot_DosingSystem.Control
                             {
 
                                 var res = LTwoInputMaterialQuene.FirstOrDefault(p => p.materialType.MaterialLoc == globalVar.rollerLineTwo.StationEight);
-                                if ((globalVar.rollerLineTwo.StationEight != 0 && globalVar.rollerLineTwo.StationEight == globalVar.rollerLineTwo.EmptyRollerNums.ElementAt(0) && LTwoInputMaterialQuene.Count > 0 && globalVar.rollerLineTwo.StationEight != LTwoInputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineTwo.StationEight != 0 && globalVar.rollerLineTwo.StationEight == globalVar.rollerLineTwo.EmptyRollerNums.ElementAt(0)))//工位8上面有桶且不是配方上的原料桶,即空桶
+                                if ((globalVar.rollerLineTwo.StationEight != 0 && globalVar.rollerLineTwo.EmptyRollerNums.Contains(globalVar.rollerLineTwo.StationEight) && LTwoInputMaterialQuene.Count > 0 && globalVar.rollerLineTwo.StationEight != LTwoInputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineTwo.StationEight != 0 && globalVar.rollerLineTwo.EmptyRollerNums.Contains(globalVar.rollerLineTwo.StationEight)))//工位8上面有桶且不是配方上的原料桶,即空桶
                                 {
+                                    LTwoCurrentRollerNum = globalVar.rollerLineTwo.StationEight;
                                 //下发AGV去空桶线洗桶任务
                                 e: string id = Guid.NewGuid().ToString("D");
                                     if (id == LOnerobotJobId || id == LTworobotJobId || id == LThreerobotJobId || id == LFourrobotJobId || id == LFiverobotJobId || id == LSixrobotJobId || LSevenrobotJobId.FirstOrDefault(p => p == id) != null || LEightrobotJobId.FirstOrDefault(p => p == id) != null || LNinerobotJobId.FirstOrDefault(p => p == id) != null || LTenrobotJobId.FirstOrDefault(p => p == id) != null)
@@ -2707,7 +3348,7 @@ namespace FryPot_DosingSystem.Control
                                     //Thread.Sleep(500);
                                     if (LineToCleanCarryTaskErrorCodeAnalysis(info, 2))
                                     {
-
+                                        WritePlcData("D1250", LTwoCurrentRollerNum);//下发空桶桶号到洗桶机
                                         globalVar.rollerLineTwo.IsEpmtyBefore = true;
                                         globalVar.AllowNextEmptyRollerToClean = false;
                                     }
@@ -2723,7 +3364,7 @@ namespace FryPot_DosingSystem.Control
 
                             else
                             {
-                                AgvFromLineTwoToClean(globalVar.rollerLineTwo.EmptyRollerNums.ElementAt(0));//AGV从线体1到清洗处
+                                AgvFromLineTwoToClean(LTwoCurrentRollerNum);//AGV从线体1到清洗处
                             }
                         }
 
@@ -2784,13 +3425,13 @@ namespace FryPot_DosingSystem.Control
             //线体3到清洗台
             if (AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble == 0)//输送线无故障
             {
-                if (TTrig.GetInstance("LineThreeModel").Start(Convert.ToBoolean(globalVar.rollerLineTwo.WashEmptyRollerModel)))
+                if (TTrig.GetInstance("LineThreeModel").Start(Convert.ToBoolean(globalVar.rollerLineThree.WashEmptyRollerModel)))
                 {
                     MessageNotify.GetInstance.ShowRunLog($"3号滚筒线切换为普通洗桶模式");
                 }
                 if (globalVar.rollerLineThree.WashEmptyRollerModel == 0)
                 {
-                    
+
                     try
                     {
                         lock (Obj_Lock)
@@ -2799,8 +3440,9 @@ namespace FryPot_DosingSystem.Control
                             {
 
                                 var res = LThreeInputMaterialQuene.FirstOrDefault(p => p.materialType.MaterialLoc == globalVar.rollerLineThree.StationEight);
-                                if ((globalVar.rollerLineThree.StationEight != 0 && globalVar.rollerLineThree.StationEight == globalVar.rollerLineThree.EmptyRollerNums.ElementAt(0) && LThreeInputMaterialQuene.Count > 0 && globalVar.rollerLineThree.StationEight != LThreeInputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineThree.StationEight != 0 && globalVar.rollerLineThree.StationEight == globalVar.rollerLineThree.EmptyRollerNums.ElementAt(0)))//工位8上面有桶且不是配方上的原料桶,即空桶
+                                if ((globalVar.rollerLineThree.StationEight != 0 && globalVar.rollerLineThree.EmptyRollerNums.Contains(globalVar.rollerLineThree.StationEight) && LThreeInputMaterialQuene.Count > 0 && globalVar.rollerLineThree.StationEight != LThreeInputMaterialQuene.ElementAt(0).materialType.MaterialLoc) || (res == null && globalVar.rollerLineThree.StationEight != 0 && globalVar.rollerLineThree.EmptyRollerNums.Contains(globalVar.rollerLineThree.StationEight)))//工位8上面有桶且不是配方上的原料桶,即空桶
                                 {
+                                    LThreeCurrentRollerNum = globalVar.rollerLineThree.StationEight;
                                 //下发AGV去空桶线洗桶任务
                                 e: string id = Guid.NewGuid().ToString("D");
                                     if (id == LOnerobotJobId || id == LTworobotJobId || id == LThreerobotJobId || id == LFourrobotJobId || id == LFiverobotJobId || id == LSixrobotJobId || LSevenrobotJobId.FirstOrDefault(p => p == id) != null || LEightrobotJobId.FirstOrDefault(p => p == id) != null || LNinerobotJobId.FirstOrDefault(p => p == id) != null || LTenrobotJobId.FirstOrDefault(p => p == id) != null)
@@ -2811,7 +3453,7 @@ namespace FryPot_DosingSystem.Control
                                     //Thread.Sleep(500);
                                     if (LineToCleanCarryTaskErrorCodeAnalysis(info, 3))//呼叫成功
                                     {
-
+                                        WritePlcData("D1250", LThreeCurrentRollerNum);//下发空桶桶号到洗桶机
                                         globalVar.rollerLineThree.IsEpmtyBefore = true;
                                         globalVar.AllowNextEmptyRollerToClean = false;
                                     }
@@ -2827,7 +3469,7 @@ namespace FryPot_DosingSystem.Control
                             }
                             else
                             {
-                                AgvFromLineThreeToClean(globalVar.rollerLineThree.EmptyRollerNums.ElementAt(0));//AGV从线体3到清洗处
+                                AgvFromLineThreeToClean(LThreeCurrentRollerNum);//AGV从线体3到清洗处
                             }
                         }
                     }
@@ -2881,7 +3523,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         private void AgvArriveCleanPlateFromLineOne()
         {
-            if (globalVar.rollerLineOne.agvArriveCleanUnLoad||globalVar.LineSevenRobotTaskError)
+            if (globalVar.rollerLineOne.agvArriveCleanUnLoad || globalVar.LineSevenRobotTaskError)
             {
                 globalVar.rollerLineOne.agvArriveCleanUnLoad = false;
                 MessageNotify.GetInstance.ShowRunLog("空桶从线体1到达清洗位置，准备卸桶");
@@ -2931,7 +3573,7 @@ namespace FryPot_DosingSystem.Control
                     while (AlarmHelper<AlarmInfo>.GetInstance("洗桶机进筒未运行").CleanEnterRollerRunning == 1)
                     {
                         Thread.Sleep(1000);
-                        if (globalVar.ExitLineOneTask)
+                        if (globalVar.ExitLineTwoTask)
                             return;
                     }
                     MessageNotify.GetInstance.ShowRunLog("清洗台空桶进桶滚筒重新运行！！");
@@ -2963,7 +3605,7 @@ namespace FryPot_DosingSystem.Control
                     while (AlarmHelper<AlarmInfo>.GetInstance("洗桶机进筒未运行").CleanEnterRollerRunning == 1)
                     {
                         Thread.Sleep(1000);
-                        if (globalVar.ExitLineOneTask)
+                        if (globalVar.ExitLineThreeTask)
                             return;
                     }
                     MessageNotify.GetInstance.ShowRunLog("清洗台空桶进桶滚筒重新运行！！");
@@ -3014,8 +3656,8 @@ namespace FryPot_DosingSystem.Control
                 globalVar.rollerLineThree.RecipeComMidSingle = 1;
                 if (globalVar.LThreeCurrentRecipeName != string.Empty)
                 {
-                    MessageNotify.GetInstance.ShowUserLog($"【3】号滚筒线【{globalVar.LThreeCurrentRecipeName}】 配方所有料桶已送达炒锅");
-                    ResetPotData(3);
+                    MessageNotify.GetInstance.ShowRunLog($"【3】号滚筒线【{globalVar.LThreeCurrentRecipeName}】 配方所有料桶已送达炒锅");
+                    // ResetPotData(3);
                     WritePlcData("D2103", 0);
                     WritePlcData("D1103", 0);//复位开始执行指令
                     PlcLineThreeRecipeDataReset();
@@ -3035,17 +3677,19 @@ namespace FryPot_DosingSystem.Control
                 }
             }
             if (RTrig.GetInstance("炒锅3配方完成").Start(Convert.ToBoolean(globalVar.fryPotThree.RecipeCompleteSingle)))
+            {
+                ResetPotData(3);
+                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep + 1, Name = "配方制作完成！", isBool = IsBool.Yes }); }));
+                ActionManage.GetInstance.Send("炒锅工艺流程更新", 3);
+                MessageNotify.GetInstance.ShowRunLog("炒锅3配方制作完成");
+                AgvViewModel.GetInstance().Set启动或停止炒锅(3, IsRun.Stop);
                 Task.Run(() => { Thread.Sleep(1500); fryThreeRecipe = string.Empty; });
+            }
+
             if (LThreeRecipeQuene.Count > 0 && LThreeOutputMaterialQuene.Count == 0 && LThreeInputMaterialQuene.Count == 0 && globalVar.rollerLineThree.RecipeComMidSingle == 1 && globalVar.rollerLineThree.WashEmptyRollerModel == 0)//后续添加其它限制条件
             {
-                if (RTrig.GetInstance("炒锅3配方完成").Start(Convert.ToBoolean(globalVar.fryPotThree.RecipeCompleteSingle)) || globalVar.LThreeFryPotSerial == 0 || globalVar.fryPotThree.ProcessStep == 0)
+                if (globalVar.fryPotThree.RecipeCompleteSingle == 1 || globalVar.fryPotThree.ProcessStep == 0)
                 {
-                    if (globalVar.LThreeCurrentRecipeName != string.Empty)
-                    {
-                       // globalVar.LThreeCurrentRecipeName = string.Empty;
-                        Task.Run(() => { Thread.Sleep(1500); fryThreeRecipe = string.Empty; });
-                    }
-
                     Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.goodsName = string.Empty; }));
                     Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows = new ObservableCollection<WorkflowModel>(); }));
                     AgvViewModel.GetInstance().Set启动或停止炒锅(3, IsRun.Stop);
@@ -3058,6 +3702,7 @@ namespace FryPot_DosingSystem.Control
 
                     if (LThreeRecipeQuene.TryDequeue(out NewRecipeModel result))
                     {
+                        potThreeCurrentRecipe = result;
                         LThreeErrorRecipe = false;
                         int headNum = result.materialCollection[0].MaterialLoc / 100;
                         globalVar.LThreeMaterialNum = result.materialCollection.Count;
@@ -3070,35 +3715,36 @@ namespace FryPot_DosingSystem.Control
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.goodsName = result.RecipeName; }));
                         for (int i = 0; i < result.materialCollection.Count; i++) //遍历单个配方中所有物料
                         {
-                            //if (result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && headNum == 3)
-                            //{
-                           
-                            //将配方中原料加入新的队列
-                            LThreeInputMaterialQuene.Enqueue(new MaterialInfo()
+                            if (result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && headNum == 3)
                             {
-                                materialType = result.materialCollection[i],
-                                materialId = result.RecipeId
-                            });
-                            RollerThreeDataWrite(i, result.materialCollection[i].MaterialLoc, (ushort)(result.materialCollection[i].MaterialWeight + RollerNetweight), result.materialCollection[i].MaterialOffset);//3号滚筒线桶号以及重量数据、偏差量下发 
+
+                                //将配方中原料加入新的队列
+                                LThreeInputMaterialQuene.Enqueue(new MaterialInfo()
+                                {
+                                    materialType = result.materialCollection[i],
+                                    materialId = result.RecipeId
+                                });
+                                RollerThreeDataWrite(i, result.materialCollection[i].MaterialLoc, (ushort)(result.materialCollection[i].MaterialWeight + RollerNetweight), result.materialCollection[i].MaterialOffset);//3号滚筒线桶号以及重量数据、偏差量下发 
 
 
-                          
-                            //}
-                            //                                                                                                                                                                                        else
-                            //{
-                            //    MessageNotify.GetInstance.ShowRunLog($"【3】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
-                            //    MessageNotify.GetInstance.ShowUserLog($"【3】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
-                            //    LThreeInputMaterialQuene.Clear();
-                            //    LThreeErrorRecipe = true;
-                            //    return;
-                            //}
+
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"【3】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
+                                MessageNotify.GetInstance.ShowUserLog($"【3】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
+                                LThreeInputMaterialQuene.Clear();
+                                LThreeRecipeQuene.Clear();
+                                LThreeErrorRecipe = true;
+                                return;
+                            }
                         }
                         #region 炒股用油量记录
                         try
                         {
                             if (result.FlowProcess.fpModels.Count > 0)
                             {
-                                FryPotMonitorManage.GetInstance.fryThree.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key).FryWeight;
+                                FryPotMonitorManage.GetInstance.fryThree.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key)?.FryWeight;
                                 FryPotMonitorManage.GetInstance.fryThree.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryThree.OilCapacity;
                                 FryPotRecipeSetDown(headNum, result);//炒锅工艺数据下发
                             }
@@ -3113,6 +3759,8 @@ namespace FryPot_DosingSystem.Control
                         }
                         catch (Exception)
                         {
+                            LThreeRecipeQuene.Clear();
+                            Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"炒锅工艺异常，配方下发失败"); }));
                             return;
 
                             //throw;
@@ -3122,17 +3770,33 @@ namespace FryPot_DosingSystem.Control
                                                                                                                  // globalVar.rollerLineThree.RecipeComMidSingle = 0;
                         WritePlcData("D1103", 1);//配方开始执行命令
                         globalVar.rollerLineThree.LowSignalJude = true;
+                        globalVar.LThreeCurrentCookingStep = 0;
+                        PotThreestep = 0;
+                        if (LThreeRecipeQuene.Count > 0)
+                            LThreeRecipeQuene.Clear();
+                        Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!"); }));
                     }
                 }
+                else
+                {
+                    LThreeRecipeQuene.Clear();
+                    MessageNotify.GetInstance.ShowUserLog("提示:3号滚筒线配方完成前禁止再次下发订单");
+                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"3号滚筒线配方完成前禁止再次下发订单"); }));
+                }
             }
-            //else if (RTrig.GetInstance("LineThreeModel").Start(Convert.ToBoolean(globalVar.rollerLineThree.WashEmptyRollerModel)))
-            //{
-            //    MessageNotify.GetInstance.ShowUserLog("提示：3号滚筒线处于集中洗桶模式，无法下发配方");
-            //    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"3号滚筒线处于集中洗桶模式，无法下发配方"); }));
-            //    LThreeRecipeQuene.Clear();
+            else if (globalVar.rollerLineThree.WashEmptyRollerModel == 1 && LThreeRecipeQuene.Count > 0)
+            {
+                MessageNotify.GetInstance.ShowUserLog("提示：3号滚筒线处于集中洗桶模式，无法下发配方");
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"3号滚筒线处于集中洗桶模式，无法下发配方"); }));
+                LThreeRecipeQuene.Clear();
 
-            //}
+            }
+            else if(LThreeRecipeQuene.Count > 0)
+            {
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"配方下发失败"); }));
+                LThreeRecipeQuene.Clear();
 
+            }
 
         }
         /// <summary>
@@ -3146,8 +3810,8 @@ namespace FryPot_DosingSystem.Control
                 globalVar.rollerLineTwo.RecipeComMidSingle = 1;
                 if (globalVar.LTwoCurrentRecipeName != string.Empty)
                 {
-                    MessageNotify.GetInstance.ShowUserLog($"【2】号滚筒线【{globalVar.LTwoCurrentRecipeName}】 配方所有料桶已送达炒锅");
-                    ResetPotData(globalVar.LTwoFryPotSerial);
+                    MessageNotify.GetInstance.ShowRunLog($"【2】号滚筒线【{globalVar.LTwoCurrentRecipeName}】 配方所有料桶已送达炒锅");
+                    // ResetPotData(globalVar.LTwoFryPotSerial);
                     WritePlcData("D2102", 0);
                     WritePlcData("D1102", 0);//复位开始执行指令
                     PlcLineTwoRecipeDataReset();
@@ -3173,25 +3837,43 @@ namespace FryPot_DosingSystem.Control
                         //Sqlite<PotFiveStatus>.GetInstance.Base.Add(new PotFiveStatus { Temperature = FryPotMonitorManage.GetInstance.fryFive.Temperature, HotPower = FryPotMonitorManage.GetInstance.fryFive.HotPower, Speed = FryPotMonitorManage.GetInstance.fryFive.Speed, FryPotWeight = FryPotMonitorManage.GetInstance.fryFive.FryPotWeight, OilCapacity = FryPotMonitorManage.GetInstance.fryFive.OilCapacity, TotalOilCapactiy = FryPotMonitorManage.GetInstance.fryFive.TotalOilCapactiy, TotalProduct = FryPotMonitorManage.GetInstance.fryFive.TotalProduct, Time = DateTime.Now.ToShortDateString() });//向表中新增数据
                         //Sqlite<PotFiveStatus>.GetInstance.Save();//保存数据
                     }
-                      globalVar.LTwoCurrentRecipeName = string.Empty;
+                    globalVar.LTwoCurrentRecipeName = string.Empty;
                     // Task.Run(() => { Thread.Sleep(1500); fryTwoRecipe = string.Empty; fryFiveRecipe = string.Empty; });
                 }
             }
             if (RTrig.GetInstance("炒锅2配方完成").Start(Convert.ToBoolean(globalVar.fryPotTwo.RecipeCompleteSingle)))
+            {
+                ResetPotData(2);
+
+                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep + 1, Name = "配方制作完成！", isBool = IsBool.Yes }); }));
+                ActionManage.GetInstance.Send("炒锅工艺流程更新", 2);
+                MessageNotify.GetInstance.ShowRunLog("炒锅2配方制作完成");
+                AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LTwoFryPotSerial, IsRun.Stop);
                 Task.Run(() => { Thread.Sleep(1500); fryTwoRecipe = string.Empty; });
+            }
+
             if (RTrig.GetInstance("炒锅5配方完成").Start(Convert.ToBoolean(globalVar.fryPotFive.RecipeCompleteSingle)))
+            {
+                ResetPotData(5);
+
+                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LFiveCurrentCookingStep + 1, Name = "配方制作完成！", isBool = IsBool.Yes }); }));
+                ActionManage.GetInstance.Send("炒锅工艺流程更新", 5);
+                MessageNotify.GetInstance.ShowRunLog("炒锅5配方制作完成");
+                AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LTwoFryPotSerial, IsRun.Stop);
                 Task.Run(() => { Thread.Sleep(1500); fryFiveRecipe = string.Empty; });
+            }
+
             if (LTwoRecipeQuene.Count > 0 && LTwoOutputMaterialQuene.Count == 0 && LTwoInputMaterialQuene.Count == 0 && globalVar.rollerLineTwo.RecipeComMidSingle == 1 && globalVar.rollerLineTwo.WashEmptyRollerModel == 0)//后续添加其它限制条件
             {
 
-                if ((LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 2 && RTrig.GetInstance("炒锅2配方完成").Start(Convert.ToBoolean(globalVar.fryPotTwo.RecipeCompleteSingle))) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 5 && RTrig.GetInstance("炒锅5配方完成").Start(Convert.ToBoolean(globalVar.fryPotFive.RecipeCompleteSingle))) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 2 && globalVar.fryPotFive.ProcessStep == 0) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 5 && globalVar.fryPotTwo.ProcessStep == 0) || globalVar.LTwoFryPotSerial == 0 || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 5 && globalVar.fryPotFive.ProcessStep == 0)|| (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial ==2 && globalVar.fryPotTwo.ProcessStep == 0))
+                if ((LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 2 && globalVar.fryPotTwo.RecipeCompleteSingle == 1) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 5 && globalVar.fryPotFive.RecipeCompleteSingle == 1) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 2 && globalVar.fryPotFive.ProcessStep == 0) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 5 && globalVar.fryPotTwo.ProcessStep == 0) || (globalVar.LTwoFryPotSerial == 0 && globalVar.fryPotTwo.ProcessStep == 0 && globalVar.fryPotFive.ProcessStep == 0) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 5 && globalVar.fryPotFive.ProcessStep == 0) || (LTwoRecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LTwoFryPotSerial && globalVar.LTwoFryPotSerial == 2 && globalVar.fryPotTwo.ProcessStep == 0))
                 {
                     if (globalVar.LTwoFryPotSerial == 2)
                     {
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.goodsName = string.Empty; }));
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows = new ObservableCollection<WorkflowModel>(); }));
                         AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LTwoFryPotSerial, IsRun.Stop);
-                       
+
                         Task.Run(() => { Thread.Sleep(1500); fryTwoRecipe = string.Empty; });
                     }
                     if (globalVar.LTwoFryPotSerial == 5)
@@ -3199,18 +3881,18 @@ namespace FryPot_DosingSystem.Control
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.goodsName = string.Empty; }));
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows = new ObservableCollection<WorkflowModel>(); }));
                         AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LTwoFryPotSerial, IsRun.Stop);
-                        
+
                         Task.Run(() => { Thread.Sleep(1500); fryFiveRecipe = string.Empty; });
                     }
                     //if (globalVar.LTwoCurrentRecipeName != string.Empty)
                     //    MessageLog.GetInstance.ShowUserLog($"【2】号滚筒线【{globalVar.LTwoCurrentRecipeName}】 配方制作完成");
-                    
-                    
+
+
                     WritePlcData("D2102", 0);
                     WritePlcData("D1102", 0);//复位开始执行指令
                                              //清空配方数据队列
                     PlcLineTwoRecipeDataReset();//PLC复位
-              
+
                     if (LTwoRecipeQuene.TryDequeue(out NewRecipeModel result))
                     {
                         LTwoErrorRecipe = false;
@@ -3222,11 +3904,17 @@ namespace FryPot_DosingSystem.Control
                         MessageNotify.GetInstance.ShowUserLog($"【2】号滚筒线开始制作【{result.RecipeName}】 配方");
                         if (headNum == 2)//炒锅2
                         {
+                            potTwoCurrentRecipe = result;
+                            globalVar.LTwoCurrentCookingStep = 0;
+                            PotTwostep = 0;
                             fryTwoRecipe = result.RecipeName;//炒锅状态开始记录
                             Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.goodsName = result.RecipeName; }));
                         }
                         else//炒锅5
                         {
+                            potFiveCurrentRecipe = result;
+                            PotFivestep = 0;
+                            globalVar.LFiveCurrentCookingStep = 0;
                             fryFiveRecipe = result.RecipeName;//炒锅状态开始记录
                             Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.goodsName = result.RecipeName; }));
                         }
@@ -3234,95 +3922,114 @@ namespace FryPot_DosingSystem.Control
                         Thread.Sleep(800);
                         for (int i = 0; i < result.materialCollection.Count; i++) //遍历单个配方中所有物料
                         {
-                            //if (result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && (headNum == 2 || headNum == 5))
-                            //{
-                          
-                            //将配方中原料加入新的队列
-                            LTwoInputMaterialQuene.Enqueue(new MaterialInfo()
+                            if (result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && (headNum == 2 || headNum == 5))
                             {
-                                materialType = result.materialCollection[i],
-                                materialId = result.RecipeId
-                            });
-                            RollerTwoDataWrite(i, result.materialCollection[i].MaterialLoc, (ushort)(result.materialCollection[i].MaterialWeight + RollerNetweight), result.materialCollection[i].MaterialOffset);//2号滚筒线桶号以及重量、偏差量数据下发 
 
-                          
+                                //将配方中原料加入新的队列
+                                LTwoInputMaterialQuene.Enqueue(new MaterialInfo()
+                                {
+                                    materialType = result.materialCollection[i],
+                                    materialId = result.RecipeId
+                                });
+                                RollerTwoDataWrite(i, result.materialCollection[i].MaterialLoc, (ushort)(result.materialCollection[i].MaterialWeight + RollerNetweight), result.materialCollection[i].MaterialOffset);//2号滚筒线桶号以及重量、偏差量数据下发 
 
-                            //}
-                            //else
-                            //{
-                            //    MessageNotify.GetInstance.ShowRunLog($"【2】号滚筒线配方桶号配置错误,取消【{result.RecipeName}】配方制作");
-                            //    MessageNotify.GetInstance.ShowUserLog($"【2】号滚筒线配方桶号配置错误,取消【{result.RecipeName}】配方制作");
-                            //    LTwoInputMaterialQuene.Clear();
-                            //    LTwoErrorRecipe = true;
-                            //    return;
-                            //}
+
+
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"【2】号滚筒线配方桶号配置错误,取消【{result.RecipeName}】配方制作");
+                                MessageNotify.GetInstance.ShowUserLog($"【2】号滚筒线配方桶号配置错误,取消【{result.RecipeName}】配方制作");
+                                LTwoInputMaterialQuene.Clear();
+                                LTwoRecipeQuene.Clear();
+                                LTwoErrorRecipe = true;
+                                return;
+                            }
                         }
                         #region 炒股用油量记录
-                        //if (headNum == 2)
-                        //{
-                        //    try
-                        //    {
-                        //        if (result.FlowProcess.fpModels.Count > 0)
-                        //        {
-                        //            FryPotMonitorManage.GetInstance.fryTwo.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key).FryWeight;
-                        //            FryPotMonitorManage.GetInstance.fryTwo.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryTwo.OilCapacity;
-                        //            FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
-                        //        }
-                        //        else
-                        //        {
-                        //            MessageNotify.GetInstance.ShowUserLog($"2号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
-                        //            LTwoRecipeQuene.Clear();
-                        //            LTwoInputMaterialQuene.Clear();
-                        //            Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
-                        //            return;
-                        //        }
-                        //    }
-                        //    catch (Exception)
-                        //    {
-                        //        return;
-                        //        // throw;
-                        //    }
-                        //}
-                        //else
-                        //{
-                        //    try
-                        //    {
-                        //        if (result.FlowProcess.fpModels.Count > 0)
-                        //        {
-                        //            FryPotMonitorManage.GetInstance.fryFive.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key).FryWeight;
-                        //            FryPotMonitorManage.GetInstance.fryFive.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryFive.OilCapacity;
-                        //            FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
-                        //        }
-                        //        else
-                        //        {
-                        //            MessageNotify.GetInstance.ShowUserLog($"2号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
-                        //            LTwoRecipeQuene.Clear();
-                        //            LTwoInputMaterialQuene.Clear();
-                        //            Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
-                        //            return;
-                        //        }
-                        //    }
-                        //    catch (Exception)
-                        //    {
-                        //        return;
-                        //        // throw;
-                        //    }
-                        //}
+                        if (headNum == 2)
+                        {
+                            try
+                            {
+                                if (result.FlowProcess.fpModels.Count > 0)
+                                {
+                                    FryPotMonitorManage.GetInstance.fryTwo.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key)?.FryWeight;
+                                    FryPotMonitorManage.GetInstance.fryTwo.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryTwo.OilCapacity;
+                                    FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowUserLog($"2号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
+                                    LTwoRecipeQuene.Clear();
+                                    LTwoInputMaterialQuene.Clear();
+                                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
+                                    return;
+                                }
+                            }
+                            catch (Exception)
+                            {
+                                LTwoRecipeQuene.Clear();
+                                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"炒锅工艺异常，配方下发失败"); }));
+                                return;
+                                // throw;
+                            }
+                        }
+                        else
+                        {
+                            try
+                            {
+                                if (result.FlowProcess.fpModels.Count > 0)
+                                {
+                                    FryPotMonitorManage.GetInstance.fryFive.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key)?.FryWeight;
+                                    FryPotMonitorManage.GetInstance.fryFive.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryFive.OilCapacity;
+                                    FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowUserLog($"2号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
+                                    LTwoRecipeQuene.Clear();
+                                    LTwoInputMaterialQuene.Clear();
+                                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
+                                    return;
+                                }
+                            }
+                            catch (Exception)
+                            {
+                                LTwoRecipeQuene.Clear();
+                                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"炒锅工艺异常，配方下发失败"); }));
+                                return;
+                                // throw;
+                            }
+                        }
                         #endregion
                         DeviceOperate.GetInstance.WritePlcData("D1026", (ushort)result.materialCollection.Count);//发送2号滚筒线工序数据
                                                                                                                  //globalVar.rollerLineTwo.RecipeComMidSingle = 0;
                         WritePlcData("D1102", 1);//配方开始执行命令
                         globalVar.rollerLineTwo.LowSignalJude = true;
+                        if (LTwoRecipeQuene.Count > 0)
+                            LTwoRecipeQuene.Clear();
+                        Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!"); }));
                     }
 
                 }
+                else
+                {
+                    LTwoRecipeQuene.Clear();
+                    MessageNotify.GetInstance.ShowUserLog("提示:2号滚筒线配方完成前禁止再次下发订单");
+                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"2号滚筒线配方完成前禁止再次下发订单"); }));
+                }
+            }
+            else if (globalVar.rollerLineTwo.WashEmptyRollerModel == 1 && LTwoRecipeQuene.Count > 0)
+            {
+                MessageNotify.GetInstance.ShowUserLog("提示：2号滚筒线处于集中洗桶模式，无法下发配方");
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"2号滚筒线处于集中洗桶模式，无法下发配方"); }));
+                LTwoRecipeQuene.Clear();
+            }
+            else if(LTwoRecipeQuene.Count > 0)
+            {
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"配方下发失败"); }));
+                LTwoRecipeQuene.Clear();
             }
-            //else if (RTrig.GetInstance("LineTwoModel").Start(Convert.ToBoolean(globalVar.rollerLineTwo.WashEmptyRollerModel)))
-            //{
-            //    MessageNotify.GetInstance.ShowUserLog("提示：2号滚筒线处于集中洗桶模式，无法下发配方");
-            //    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"2号滚筒线处于集中洗桶模式，无法下发配方"); }));
-            //    LTwoRecipeQuene.Clear();
-            //} 
         }
 
         /// <summary>
@@ -3335,8 +4042,8 @@ namespace FryPot_DosingSystem.Control
                 globalVar.rollerLineOne.RecipeComMidSingle = 1;
                 if (globalVar.LOneCurrentRecipeName != string.Empty)
                 {
-                    MessageNotify.GetInstance.ShowUserLog($"【1】号滚筒线【{globalVar.LOneCurrentRecipeName}】 配方所有料桶已送达炒锅");
-                    ResetPotData(globalVar.LOneFryPotSerial);
+                    MessageNotify.GetInstance.ShowRunLog($"【1】号滚筒线【{globalVar.LOneCurrentRecipeName}】 配方所有料桶已送达炒锅");
+                    //   ResetPotData(globalVar.LOneFryPotSerial);
                     WritePlcData("D2101", 0);
                     WritePlcData("D1101", 0);//复位开始执行指令
                     PlcLineOneRecipeDataReset();
@@ -3363,42 +4070,59 @@ namespace FryPot_DosingSystem.Control
                         //Sqlite<PotFourStatus>.GetInstance.Base.Add(new PotFourStatus { Temperature = FryPotMonitorManage.GetInstance.fryFour.Temperature, HotPower = FryPotMonitorManage.GetInstance.fryFour.HotPower, Speed = FryPotMonitorManage.GetInstance.fryFour.Speed, FryPotWeight = FryPotMonitorManage.GetInstance.fryFour.FryPotWeight, OilCapacity = FryPotMonitorManage.GetInstance.fryFour.OilCapacity, TotalOilCapactiy = FryPotMonitorManage.GetInstance.fryFour.TotalOilCapactiy, TotalProduct = FryPotMonitorManage.GetInstance.fryFour.TotalProduct, Time = DateTime.Now.ToShortDateString() });//向表中新增数据
                         //Sqlite<PotFourStatus>.GetInstance.Save();//保存数据
                     }
-                       globalVar.LOneCurrentRecipeName = string.Empty;
+                    globalVar.LOneCurrentRecipeName = string.Empty;
                     // Task.Run(() => { Thread.Sleep(1500); fryOneRecipe = string.Empty; fryFourRecipe = string.Empty; });
                 }
             }
             if (RTrig.GetInstance("炒锅1配方完成").Start(Convert.ToBoolean(globalVar.fryPotOne.RecipeCompleteSingle)))
-                     Task.Run(() => { Thread.Sleep(1500); fryOneRecipe = string.Empty; });
+            {
+                ResetPotData(1);
+                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep + 1, Name = "配方制作完成！", isBool = IsBool.Yes }); }));
+                ActionManage.GetInstance.Send("炒锅工艺流程更新", 1);
+                MessageNotify.GetInstance.ShowRunLog("炒锅1配方制作完成");
+                AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LOneFryPotSerial, IsRun.Stop);
+                Task.Run(() => { Thread.Sleep(1500); fryOneRecipe = string.Empty; });
+            }
+
             if (RTrig.GetInstance("炒锅4配方完成").Start(Convert.ToBoolean(globalVar.fryPotFour.RecipeCompleteSingle)))
-                     Task.Run(() => { Thread.Sleep(1500); fryFourRecipe = string.Empty; });
+            {
+                ResetPotData(4);
+                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LFourCurrentCookingStep + 1, Name = "配方制作完成！", isBool = IsBool.Yes }); }));
+                ActionManage.GetInstance.Send("炒锅工艺流程更新", 4);
+                MessageNotify.GetInstance.ShowRunLog("炒锅4配方制作完成");
+                AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LOneFryPotSerial, IsRun.Stop);
+                Task.Run(() => { Thread.Sleep(1500); fryFourRecipe = string.Empty; });
+            }
             if (RecipeQuene.Count > 0 && OutputMaterialQuene.Count == 0 && InputMaterialQuene.Count == 0 && globalVar.rollerLineOne.RecipeComMidSingle == 1 && globalVar.rollerLineOne.WashEmptyRollerModel == 0)//后续添加其它限制条件
             {
-                //if ((RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 1 && RTrig.GetInstance("炒锅1配方完成").Start(Convert.ToBoolean(globalVar.fryPotOne.RecipeCompleteSingle))) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 4 && RTrig.GetInstance("炒锅4配方完成").Start(Convert.ToBoolean(globalVar.fryPotFour.RecipeCompleteSingle))) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 1 && globalVar.fryPotFour.ProcessStep == 0) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 4 && globalVar.fryPotOne.ProcessStep == 0) || globalVar.LOneFryPotSerial == 0||(RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 4 && globalVar.fryPotFour.ProcessStep == 0)||(RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 1 && globalVar.fryPotOne.ProcessStep == 0)) //炒锅空闲才能下配方
-                //{
-                if (globalVar.LOneFryPotSerial == 1)
+                if ((RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 1 && globalVar.fryPotOne.RecipeCompleteSingle == 1) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == 4 && globalVar.fryPotFour.RecipeCompleteSingle == 1) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 1 && globalVar.fryPotFour.ProcessStep == 0) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 != globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 4 && globalVar.fryPotOne.ProcessStep == 0) || (globalVar.LOneFryPotSerial == 0 && globalVar.fryPotOne.ProcessStep == 0 && globalVar.fryPotFour.ProcessStep == 0) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 4 && globalVar.fryPotFour.ProcessStep == 0) || (RecipeQuene.ElementAt(0).materialCollection[0].MaterialLoc / 100 == globalVar.LOneFryPotSerial && globalVar.LOneFryPotSerial == 1 && globalVar.fryPotOne.ProcessStep == 0)) //炒锅空闲才能下配方
+                {
+                    if (globalVar.LOneFryPotSerial == 1)
                     {
-
+                        globalVar.LOneCurrentCookingStep = 0;
+                        PotOnestep = 0;
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.goodsName = string.Empty; }));
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows = new ObservableCollection<WorkflowModel>(); }));
                         AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LOneFryPotSerial, IsRun.Stop);
-                       
+
                         Task.Run(() => { Thread.Sleep(1500); fryOneRecipe = string.Empty; });
                     }
                     if (globalVar.LOneFryPotSerial == 4)
                     {
-
+                        globalVar.LFourCurrentCookingStep = 0;
+                        PotFourstep = 0;
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.goodsName = string.Empty; }));
                         Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows = new ObservableCollection<WorkflowModel>(); }));
                         AgvViewModel.GetInstance().Set启动或停止炒锅(globalVar.LOneFryPotSerial, IsRun.Stop);
-                       
+
                         Task.Run(() => { Thread.Sleep(1500); fryFourRecipe = string.Empty; });
                     }
-                   
+
                     WritePlcData("D2101", 0);
                     WritePlcData("D1101", 0);//复位开始执行指令
                                              //清空配方数据队列
                     PlcLineOneRecipeDataReset();//PLC复位
-                   
+
                     if (RecipeQuene.TryDequeue(out NewRecipeModel result))
                     {
                         ErrorRecipe = false;
@@ -3410,11 +4134,13 @@ namespace FryPot_DosingSystem.Control
                         MessageNotify.GetInstance.ShowUserLog($"【1】号滚筒线开始制作【{result.RecipeName}】 配方");
                         if (headNum == 1)//炒锅1
                         {
+                            potOneCurrentRecipe = result;
                             fryOneRecipe = result.RecipeName;//炒锅状态开始记录
                             Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.goodsName = result.RecipeName; }));
                         }
                         else//炒锅4
                         {
+                            potFourCurrentRecipe = result;
                             fryFourRecipe = result.RecipeName;//炒锅状态开始记录
                             Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.goodsName = result.RecipeName; }));
                         }
@@ -3422,11 +4148,11 @@ namespace FryPot_DosingSystem.Control
                         Thread.Sleep(800);
                         for (int i = 0; i < result.materialCollection.Count; i++) //遍历单个配方中所有物料
                         {
-                        if (result.materialCollection.Count <= 8 && result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && (headNum == 1 || headNum == 4))
-                        {
+                            if (result.materialCollection.Count <= 8 && result.materialCollection[i].MaterialLoc % 100 == i + 1 && result.materialCollection[i].MaterialLoc / 100 == headNum && (headNum == 1 || headNum == 4))
+                            {
 
-                            //将配方中原料加入新的队列
-                            InputMaterialQuene.Enqueue(new MaterialInfo()
+                                //将配方中原料加入新的队列
+                                InputMaterialQuene.Enqueue(new MaterialInfo()
                                 {
                                     materialType = result.materialCollection[i],
                                     materialId = result.RecipeId
@@ -3437,81 +4163,101 @@ namespace FryPot_DosingSystem.Control
 
 
 
+                            }
+                            else
+                            {
+                                MessageNotify.GetInstance.ShowRunLog($"【1】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
+                                MessageNotify.GetInstance.ShowUserLog($"【1】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
+                                InputMaterialQuene.Clear();
+                                RecipeQuene.Clear();
+                                ErrorRecipe = true;
+                                return;
+                            }
+                        }
+                        #region 炒股用油量记录及工艺下发
+                        if (headNum == 1)
+                        {
+                            try
+                            {
+                                if (result.FlowProcess.fpModels.Count > 0)
+                                {
+
+                                    FryPotMonitorManage.GetInstance.fryOne.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key)?.FryWeight;
+                                    FryPotMonitorManage.GetInstance.fryOne.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryOne.OilCapacity;
+                                    FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowUserLog($"1号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
+                                    RecipeQuene.Clear();
+                                    InputMaterialQuene.Clear();
+                                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
+                                    return;
+                                }
+                            }
+                            catch (Exception)
+                            {
+                                RecipeQuene.Clear();
+                                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"炒股工艺异常，配方下发失败"); }));
+                                return;
+                                // throw;
+                            }
                         }
                         else
                         {
-                            MessageNotify.GetInstance.ShowRunLog($"【1】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
-                            MessageNotify.GetInstance.ShowUserLog($"【1】号滚筒线配方桶号配置错误，取消【{result.RecipeName}】配方制作");
-                            InputMaterialQuene.Clear();
-                            ErrorRecipe = true;
-                            return;
+                            try
+                            {
+                                if (result.FlowProcess.fpModels.Count > 0)
+                                {
+                                    FryPotMonitorManage.GetInstance.fryFour.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key)?.FryWeight;
+                                    FryPotMonitorManage.GetInstance.fryFour.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryFour.OilCapacity;
+                                    FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
+                                }
+                                else
+                                {
+                                    MessageNotify.GetInstance.ShowUserLog($"1号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
+                                    RecipeQuene.Clear();
+                                    InputMaterialQuene.Clear();
+                                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
+                                    return;
+                                }
+                            }
+                            catch (Exception)
+                            {
+                                RecipeQuene.Clear();
+                                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"炒锅工艺异常，配方下发失败"); }));
+                                return;
+                                //throw;
+                            }
                         }
-                    }
-                        #region 炒股用油量记录及工艺下发
-                        //if (headNum == 1)
-                        //{
-                        //    try
-                        //    {
-                        //        if (result.FlowProcess.fpModels.Count > 0)
-                        //        {
-                        //            FryPotMonitorManage.GetInstance.fryOne.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key).FryWeight;
-                        //            FryPotMonitorManage.GetInstance.fryOne.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryOne.OilCapacity;
-                        //            FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
-                        //        }
-                        //        else
-                        //        {
-                        //            MessageNotify.GetInstance.ShowUserLog($"1号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
-                        //            RecipeQuene.Clear();
-                        //            InputMaterialQuene.Clear();
-                        //            Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
-                        //            return;
-                        //        }
-                        //    }
-                        //    catch (Exception)
-                        //    {
-                        //        return;
-                        //        // throw;
-                        //    }
-                        //}
-                        //else
-                        //{
-                        //    try
-                        //    {
-                        //        if (result.FlowProcess.fpModels.Count > 0)
-                        //        {
-                        //            FryPotMonitorManage.GetInstance.fryFour.OilCapacity = result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == (Json<FlowProcessNames>.Data.NameId.FirstOrDefault(s => s.Value == 1)).Key).FryWeight;
-                        //            FryPotMonitorManage.GetInstance.fryFour.TotalOilCapactiy += FryPotMonitorManage.GetInstance.fryFour.OilCapacity;
-                        //            FryPotRecipeSetDown(headNum, result);//炒锅工艺下发
-                        //        }
-                        //        else
-                        //        {
-                        //            MessageNotify.GetInstance.ShowUserLog($"1号滚筒线【{result.RecipeName}】配方未制定炒锅工艺，已取消");
-                        //            RecipeQuene.Clear();
-                        //            InputMaterialQuene.Clear();
-                        //            Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"当前配方未指定炒锅工艺，配方取消制作"); }));
-                        //            return;
-                        //        }
-                        //    }
-                        //    catch (Exception)
-                        //    {
-                        //        return;
-                        //        //throw;
-                        //    }
-                        //}
                         #endregion
                         DeviceOperate.GetInstance.WritePlcData("D1009", (ushort)result.materialCollection.Count);//发送1号滚筒线工序数据
                         WritePlcData("D1101", 1);//线体1配方开始执行命令
                         globalVar.rollerLineOne.LowSignalJude = true;
+                        if (RecipeQuene.Count > 0)
+                            RecipeQuene.Clear();
+                        Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!"); }));
                     }
-                //}
+                }
+                else
+                {
+                    RecipeQuene.Clear();
+                    MessageNotify.GetInstance.ShowUserLog("提示:1号滚筒线配方完成前禁止再次下发订单");
+                    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"1号滚筒线配方完成前禁止再次下发订单"); }));
+                }
             }
-            //else if (RTrig.GetInstance("LineOneModel").Start(Convert.ToBoolean(globalVar.rollerLineOne.WashEmptyRollerModel)))
-            //{
-            //    MessageNotify.GetInstance.ShowUserLog("提示：1号滚筒线处于集中洗桶模式，无法下发配方");
-            //    Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"1号滚筒线处于集中洗桶模式，无法下发配方"); }));
-            //    RecipeQuene.Clear();
-            //}
+            else if (globalVar.rollerLineOne.WashEmptyRollerModel == 1 && RecipeQuene.Count > 0)
+            {
+                MessageNotify.GetInstance.ShowUserLog("提示：1号滚筒线处于集中洗桶模式，无法下发配方");
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"1号滚筒线处于集中洗桶模式，无法下发配方"); }));
+                RecipeQuene.Clear();
+            }
+            else if (RecipeQuene.Count>0)
+            {
+                Application.Current.Dispatcher.Invoke(new Action(() => { NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"配方下发失败"); }));
+                RecipeQuene.Clear();
 
+            }
 
         }
 
@@ -3548,7 +4294,7 @@ namespace FryPot_DosingSystem.Control
                     MessageNotify.GetInstance.ShowUserLog($"1号滚筒线所有配方已清除");
                     globalVar.LOneCurrentRecipeName = string.Empty;
                     globalVar.rollerLineOne.LowSignalJude = false;
-                    
+
                 }
                 else //未收到下位执行信号
                 {
@@ -3576,7 +4322,7 @@ namespace FryPot_DosingSystem.Control
                     LTwoRecipeQuene.Clear();
                     LTwoOutputMaterialQuene.Clear();
                     globalVar.rollerLineTwo.NextStart = false;
-                    ResetPotData(globalVar.LOneFryPotSerial);
+                    ResetPotData(globalVar.LTwoFryPotSerial);
                     WritePlcData("D2102", 0);
                     WritePlcData("D1102", 0);//复位开始执行指令
                                              //清空配方数据队列
@@ -3615,7 +4361,7 @@ namespace FryPot_DosingSystem.Control
                     LThreeRecipeQuene.Clear();
                     LThreeOutputMaterialQuene.Clear();
                     globalVar.rollerLineThree.NextStart = false;
-                    ResetPotData(globalVar.LOneFryPotSerial);
+                    ResetPotData(globalVar.LThreeFryPotSerial);
                     WritePlcData("D2103", 0);
                     WritePlcData("D1103", 0);//复位开始执行指令
                                              //清空配方数据队列
@@ -3645,8 +4391,8 @@ namespace FryPot_DosingSystem.Control
             {
                 AgvToLineOneLoadRoller();
                 AgvFromLineOneToFryPot();//AGV到1号线体装桶
-                AgvLineOneLoadRollerCom();
             }
+            AgvLineOneLoadRollerCom();
         }
         /// <summary>
         /// 判断agv在1号线体是否上料完成,作为线体空桶能否开始运输的条件
@@ -3654,8 +4400,10 @@ namespace FryPot_DosingSystem.Control
         /// <exception cref="NotImplementedException"></exception>
         private void AgvLineOneLoadRollerCom()
         {
-            if (globalVar.agvLineOneLoadCom|| globalVar.LineOneRobotTaskError)
+            if ((globalVar.agvLineOneLoadCom || globalVar.LineOneRobotTaskError)&& globalVar.AgvToFryPot)
             {
+                if (globalVar.LineOneRobotTaskError)
+                    DeviceOperate.GetInstance.WritePlcData("D1052", 0);//就位信号复位
                 globalVar.rollerLineOne.CanRun = true;
                 globalVar.agvLineOneLoadCom = false;
                 MessageNotify.GetInstance.ShowRunLog("AGV在【1】号滚筒线装桶完成");
@@ -3671,17 +4419,18 @@ namespace FryPot_DosingSystem.Control
             {
                 AgvToLineTwoLoadRoller();
                 AgvFromLineTwoToFryPot();//AGV到2号线体装桶 
-                AgvLineTwoLoadRollerCom();
-
             }
+            AgvLineTwoLoadRollerCom();
         }
         /// <summary>
-        /// 判断agv在1号线体是否上料完成,作为线体空桶能否开始运输的条件
+        /// 判断agv在2号线体是否上料完成,作为线体空桶能否开始运输的条件
         /// </summary>
         private void AgvLineTwoLoadRollerCom()
         {
-            if (globalVar.agvLineTwoLoadCom|| globalVar.LineTwoRobotTaskError)
+            if ((globalVar.agvLineTwoLoadCom || globalVar.LineTwoRobotTaskError)&&globalVar.LTwoAgvToFryPot)
             {
+                if (globalVar.LineTwoRobotTaskError)
+                    DeviceOperate.GetInstance.WritePlcData("D1053", 0);
                 globalVar.rollerLineTwo.CanRun = true;
                 globalVar.agvLineTwoLoadCom = false;
                 MessageNotify.GetInstance.ShowRunLog("AGV在【2】号滚筒线装桶完成");
@@ -3698,16 +4447,19 @@ namespace FryPot_DosingSystem.Control
 
                 AgvToLineThreeLoadRoller();
                 AgvFromLineThreeToFryPot();//AGV到2号线体装桶  
-                AgvLineThreeLoadRollerCom();
+               
             }
+            AgvLineThreeLoadRollerCom();
         }
         /// <summary>
         /// 判断agv在1号线体是否上料完成,作为线体空桶能否开始运输的条件
         /// </summary>
         private void AgvLineThreeLoadRollerCom()
         {
-            if (globalVar.agvLineThreeLoadCom || globalVar.LineThreeRobotTaskError)
+            if ((globalVar.agvLineThreeLoadCom || globalVar.LineThreeRobotTaskError)&&globalVar.LThreeAgvToFryPot)
             {
+                if (globalVar.LineThreeRobotTaskError)
+                    DeviceOperate.GetInstance.WritePlcData("D1054", 0);
                 globalVar.rollerLineThree.CanRun = true;
                 globalVar.agvLineThreeLoadCom = false;
                 MessageNotify.GetInstance.ShowRunLog("AGV在【3】号滚筒线装桶完成");
@@ -3743,7 +4495,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LOneFryPotInputMaterial()
         {
-            if (OutputMaterialQuene.Count > 0 && (globalVar.agvArriveUnLoad|| globalVar.LineOneRobotTaskError) && globalVar.AgvToFryPot && !globalVar.PotOneInputMaterialArrive)
+            if (OutputMaterialQuene.Count > 0 && (globalVar.agvArriveUnLoad || globalVar.LineOneRobotTaskError) && globalVar.AgvToFryPot && !globalVar.PotOneInputMaterialArrive)
             {
                 //if (globalVar.LOneFryPotSerial == 1)
                 //{
@@ -3766,29 +4518,24 @@ namespace FryPot_DosingSystem.Control
         public void LOneFallMaterial()
         {
 
-            if (!globalVar.InOrOutputLock && ((globalVar.fryPotOne.InputMaterialArrivedSingle == 1&&globalVar.LOneFryPotSerial==1) || (globalVar.fryPotFour.InputMaterialArrivedSingle == 1&&globalVar.LOneFryPotSerial==4)) && globalVar.PotOneInputMaterialArrive && OutputMaterialQuene.Count > 0 && !globalVar.PotOneOutputRollerArrive)
+            if (!globalVar.InOrOutputLock && ((globalVar.fryPotOne.InputMaterialArrivedSingle == 1 && globalVar.LOneFryPotSerial == 1) || (globalVar.fryPotFour.InputMaterialArrivedSingle == 1 && globalVar.LOneFryPotSerial == 4)) && globalVar.PotOneInputMaterialArrive && OutputMaterialQuene.Count > 0 && !globalVar.PotOneOutputRollerArrive)
             {
-                //if (globalVar.LOneFryPotSerial == 1)
-                //{
-                //    Sqlite<PotOneStatus>.GetInstance.Base.Add(new PotOneStatus { Temperature = FryPotMonitorManage.GetInstance.fryOne.Temperature, HotPower = FryPotMonitorManage.GetInstance.fryOne.HotPower, Speed = FryPotMonitorManage.GetInstance.fryOne.Speed, FryPotWeight = FryPotMonitorManage.GetInstance.fryOne.FryPotWeight, OilCapacity = FryPotMonitorManage.GetInstance.fryOne.OilCapacity, TotalOilCapactiy = FryPotMonitorManage.GetInstance.fryOne.TotalOilCapactiy, TotalProduct = FryPotMonitorManage.GetInstance.fryOne.TotalProduct, Time = DateTime.Now.ToShortDateString() });//向表中新增数据
-                //    Sqlite<PotOneStatus>.GetInstance.Save();//保存数据
-                //}
-                //else
-                //{
-                //    Sqlite<PotFourStatus>.GetInstance.Base.Add(new PotFourStatus { Temperature = FryPotMonitorManage.GetInstance.fryFour.Temperature, HotPower = FryPotMonitorManage.GetInstance.fryFour.HotPower, Speed = FryPotMonitorManage.GetInstance.fryFour.Speed, FryPotWeight = FryPotMonitorManage.GetInstance.fryFour.FryPotWeight, OilCapacity = FryPotMonitorManage.GetInstance.fryFour.OilCapacity, TotalOilCapactiy = FryPotMonitorManage.GetInstance.fryFour.TotalOilCapactiy, TotalProduct = FryPotMonitorManage.GetInstance.fryFour.TotalProduct, Time = DateTime.Now.ToShortDateString() });//向表中新增数据
-                //    Sqlite<PotFourStatus>.GetInstance.Save();//保存数据
-                //}
+
+
                 //FryPotOneRollerTroubleCheck();
                 if ((FryPotAlarm == 1 && globalVar.LOneFryPotSerial == 1) || (FryPotFourAlarm == 1 && globalVar.LOneFryPotSerial == 4))//炒锅滚筒无故障
                 {
                     if (globalVar.LOneFryPotSerial == 1)
                     {
-
-                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep, Name = OutputMaterialQuene.ElementAt(0).materialType.MaterialName, isBool = IsBool.Yes }); }));
+                        
+                            DeviceOperate.GetInstance.WritePlcData("D1055", 0);
+                        //Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep, Name = OutputMaterialQuene.ElementAt(0).materialType.MaterialLoc.ToString(), isBool = IsBool.Yes }); }));
                     }
                     else
                     {
-                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep, Name = OutputMaterialQuene.ElementAt(0).materialType.MaterialName, isBool = IsBool.Yes }); }));
+                        
+                            DeviceOperate.GetInstance.WritePlcData("D1058", 0);
+                        // Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LFourCurrentCookingStep, Name = OutputMaterialQuene.ElementAt(0).materialType.MaterialLoc.ToString(), isBool = IsBool.Yes }); }));
                     }
 
                     //炒锅滚筒进料运行到位处理
@@ -3808,7 +4555,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LTwoFryPotInputMaterial()
         {
-            if (LTwoOutputMaterialQuene.Count > 0 &&( globalVar.LTwoagvArriveUnLoad|| globalVar.LineTwoRobotTaskError) && globalVar.LTwoAgvToFryPot && !globalVar.LTwoPotInputMaterialArrive)
+            if (LTwoOutputMaterialQuene.Count > 0 && (globalVar.LTwoagvArriveUnLoad || globalVar.LineTwoRobotTaskError) && globalVar.LTwoAgvToFryPot && !globalVar.LTwoPotInputMaterialArrive)
             {
                 //if (globalVar.LTwoFryPotSerial == 2)
                 //{
@@ -3828,7 +4575,7 @@ namespace FryPot_DosingSystem.Control
         }
         public void LTwoFallMaterial()
         {
-            if (!globalVar.LTwoInOrOutputLock && ((globalVar.fryPotTwo.InputMaterialArrivedSingle == 1&&globalVar.LTwoFryPotSerial==2) || (globalVar.fryPotFive.InputMaterialArrivedSingle == 1&&globalVar.LTwoFryPotSerial==5) && globalVar.LTwoPotInputMaterialArrive && LTwoOutputMaterialQuene.Count > 0 && !globalVar.LTwoPotOutputRollerArrive))
+            if (!globalVar.LTwoInOrOutputLock && ((globalVar.fryPotTwo.InputMaterialArrivedSingle == 1 && globalVar.LTwoFryPotSerial == 2) || (globalVar.fryPotFive.InputMaterialArrivedSingle == 1 && globalVar.LTwoFryPotSerial == 5) && globalVar.LTwoPotInputMaterialArrive && LTwoOutputMaterialQuene.Count > 0 && !globalVar.LTwoPotOutputRollerArrive))
             {
                 //if (globalVar.LTwoFryPotSerial == 2)
                 //{
@@ -3845,14 +4592,16 @@ namespace FryPot_DosingSystem.Control
                 {
                     if (globalVar.LTwoFryPotSerial == 2)
                     {
-
-                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep, Name = LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialName, isBool = IsBool.Yes }); }));
+                        
+                            DeviceOperate.GetInstance.WritePlcData("D1056", 0);
+                        //Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep, Name = LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc.ToString(), isBool = IsBool.Yes }); }));
 
                     }
                     else
                     {
-
-                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep, Name = LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialName, isBool = IsBool.Yes }); }));
+                        
+                            DeviceOperate.GetInstance.WritePlcData("D1059", 0);
+                        //Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LFiveCurrentCookingStep, Name = LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc.ToString(), isBool = IsBool.Yes }); }));
                     }
 
                     //炒锅滚筒进料运行到位处理
@@ -3892,7 +4641,9 @@ namespace FryPot_DosingSystem.Control
 
                 if (FryPotThreeAlarm == 1)//炒锅滚筒无故障
                 {
-                    Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep, Name = LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialName, isBool = IsBool.Yes }); }));
+                    
+                        DeviceOperate.GetInstance.WritePlcData("D1057", 0);
+                    //Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep, Name = LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc.ToString(), isBool = IsBool.Yes }); }));
 
                     //炒锅滚筒进料运行到位处理
                     FryPotThreeInputMaterialRollerOperate();
@@ -3930,7 +4681,7 @@ namespace FryPot_DosingSystem.Control
         //            {
         //                while (!agvFryPotEmptyRollerArrive)//等待AGV拿到出桶空桶
         //                {
-        //                    Thread.Sleep(5);
+        //                    Thread.Sleep(5);agvFryPotEmptyRollerArrive
         //                    if (globalVar.ExitMainTask)
         //                        return;
         //                }
@@ -3947,7 +4698,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LOneFryPotOutputMaterial()
         {
-            if (((globalVar.fryPotOne.EmptyBarrelArrivedSingle == 1&&globalVar.LOneFryPotSerial==1) || (globalVar.fryPotFour.EmptyBarrelArrivedSingle == 1&&globalVar.LOneFryPotSerial==4)) && OutputMaterialQuene.Count > 0 && globalVar.InOrOutputLock && globalVar.PotOneOutputRollerArrive && !globalVar.AgvArrivePot)
+            if (((globalVar.fryPotOne.EmptyBarrelArrivedSingle == 1 && globalVar.LOneFryPotSerial == 1) || (globalVar.fryPotFour.EmptyBarrelArrivedSingle == 1 && globalVar.LOneFryPotSerial == 4)) && OutputMaterialQuene.Count > 0 && globalVar.InOrOutputLock && globalVar.PotOneOutputRollerArrive && !globalVar.AgvArrivePot)
             {
                 //上游下发搬运任务给AGV
                 if (AgvFromFryPotOneOrFourToClean())
@@ -3965,10 +4716,22 @@ namespace FryPot_DosingSystem.Control
         public void LOneEmptyOperate()
         {
 
-            if ((globalVar.agvArriveUpLoad||globalVar.LineFourRobotTaskError) && OutputMaterialQuene.Count > 0 && globalVar.AgvArrivePot)
+            if ((globalVar.agvArriveUpLoad || globalVar.LineFourRobotTaskError) && OutputMaterialQuene.Count > 0 && globalVar.AgvArrivePot)
             {
-                if (globalVar.agvFryPotEmptyRollerArrive|| globalVar.LineFourRobotTaskError)
+                if (globalVar.agvFryPotEmptyRollerArrive || globalVar.LineFourRobotTaskError)//炒锅上料完成
                 {
+                    if (globalVar.LineFourRobotTaskError)
+                    {
+                        if (globalVar.LOneFryPotSerial == 1)
+                        {
+                            DeviceOperate.GetInstance.WritePlcData("D1060", 0);
+                        }
+                        else
+                        {
+                            DeviceOperate.GetInstance.WritePlcData("D1063", 0);
+                        }
+                    }
+
                     FryPotOneOrFourOutEmpetyRollerOperate();
                     if (OutputMaterialQuene.TryDequeue(out MaterialInfo materialInfo))//空桶出桶后，出料原料队列移除对应原料
                     {
@@ -4006,7 +4769,7 @@ namespace FryPot_DosingSystem.Control
         /// </summary>
         public void LTwoFryPotOutputMaterial()
         {
-            if (LTwoOutputMaterialQuene.Count > 0 && globalVar.LTwoInOrOutputLock && ((globalVar.fryPotTwo.EmptyBarrelArrivedSingle == 1&&globalVar.LTwoFryPotSerial==2) || (globalVar.fryPotFive.EmptyBarrelArrivedSingle == 1&&globalVar.LTwoFryPotSerial==5)) && globalVar.LTwoPotOutputRollerArrive && !globalVar.LTwoAgvArrivePot)
+            if (LTwoOutputMaterialQuene.Count > 0 && globalVar.LTwoInOrOutputLock && ((globalVar.fryPotTwo.EmptyBarrelArrivedSingle == 1 && globalVar.LTwoFryPotSerial == 2) || (globalVar.fryPotFive.EmptyBarrelArrivedSingle == 1 && globalVar.LTwoFryPotSerial == 5)) && globalVar.LTwoPotOutputRollerArrive && !globalVar.LTwoAgvArrivePot)
             {
                 //上游下发搬运任务给AGV
                 if (AgvFromFryPotTwoOrFiveToClean())
@@ -4033,7 +4796,17 @@ namespace FryPot_DosingSystem.Control
                 //{
                 if (globalVar.LTwoagvFryPotEmptyRollerArrive || globalVar.LineFiveRobotTaskError)
                 {
-
+                    if (globalVar.LineFiveRobotTaskError)
+                    {
+                        if (globalVar.LTwoFryPotSerial == 2)
+                        {
+                            DeviceOperate.GetInstance.WritePlcData("D1061", 0);
+                        }
+                        else
+                        {
+                            DeviceOperate.GetInstance.WritePlcData("D1064", 0);
+                        }
+                    }
                     FryPotTwoOrFiveOutEmpetyRollerOperate();
                     if (LTwoOutputMaterialQuene.TryDequeue(out MaterialInfo materialInfo))//空桶出桶后，出料原料队列移除对应原料
                     {
@@ -4093,8 +4866,10 @@ namespace FryPot_DosingSystem.Control
                 //{
                 if (globalVar.LThreeagvFryPotEmptyRollerArrive || globalVar.LineSixRobotTaskError)
                 {
+                    if (globalVar.LineSixRobotTaskError)
+                        DeviceOperate.GetInstance.WritePlcData("D1062", 0);
                     //FryPotThreeOutEmpetyRollerOperate();
-                    MessageNotify.GetInstance.ShowRunLog($"炒锅【3】原料：【{LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成");
+                    MessageNotify.GetInstance.ShowRunLog($"炒锅【3】原料：【{LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成");
                     if (LThreeOutputMaterialQuene.TryDequeue(out MaterialInfo materialInfo))//空桶出桶后，出料原料队列移除对应原料
                     {
                         //AgvViewModel.GetInstance().Set小车是否承载物品(3, IsBool.OnllYes);
@@ -4128,6 +4903,8 @@ namespace FryPot_DosingSystem.Control
 
             if (globalVar.agvArriveLineFour || globalVar.LineTenRobotTaskError)//agv到达线体4下料位置
             {
+                if (globalVar.LineTenRobotTaskError)
+                    DeviceOperate.GetInstance.WritePlcData("D1066", 0);
                 globalVar.agvArriveLineFour = false;
                 globalVar.LineTenRobotTaskError = false;//AGV故障信号复位
                 //线体四信号交互
@@ -4140,25 +4917,25 @@ namespace FryPot_DosingSystem.Control
 
         public void EmptyRollerToLinFourFromPot()
         {
-            if (globalVar.rollerLineOne.agvArriveLineFour||globalVar.LineFourRobotTaskError)//agv到达线体4下料位置
+            if (globalVar.rollerLineOne.agvArriveLineFour || globalVar.LineFourRobotTaskError)//agv到达线体4下料位置
             {
                 globalVar.rollerLineOne.agvArriveLineFour = false;
                 //线体四信号交互
                 WritePlcData("D1067", 1);//AGV空桶回桶就位信号下发PLC
                 globalVar.LineFourRobotTaskError = false;//AGV故障信号复位
-                MessageNotify.GetInstance.ShowRunLog("AGV从1号线体对应炒锅到达【4】号回收线体，准备卸桶");
+                MessageNotify.GetInstance.ShowRunLog($"AGV从【{globalVar.LOneFryPotSerial}】号炒锅到达【4】号回收线体，准备卸桶");
                 // MessageLog.GetInstance.ShowRunLog("卸桶完成");
             }
-            if (globalVar.rollerLineTwo.agvArriveLineFour|| globalVar.LineFiveRobotTaskError)//agv到达线体4下料位置
+            if (globalVar.rollerLineTwo.agvArriveLineFour || globalVar.LineFiveRobotTaskError)//agv到达线体4下料位置
             {
                 globalVar.rollerLineTwo.agvArriveLineFour = false;
                 //线体四信号交互
                 WritePlcData("D1067", 1);//AGV空桶回桶就位信号下发PLC
                 globalVar.LineFiveRobotTaskError = false;//AGV故障信号复位
-                MessageNotify.GetInstance.ShowRunLog("AGV从2号线体对应炒锅到达【4】号回收线体，准备卸桶");
+                MessageNotify.GetInstance.ShowRunLog($"AGV从【{globalVar.LTwoFryPotSerial}】炒锅到达【4】号回收线体，准备卸桶");
                 // MessageLog.GetInstance.ShowRunLog("卸桶完成");
             }
-            if (globalVar.rollerLineThree.agvArriveLineFour|| globalVar.LineSixRobotTaskError)//agv到达线体4下料位置
+            if (globalVar.rollerLineThree.agvArriveLineFour || globalVar.LineSixRobotTaskError)//agv到达线体4下料位置
             {
                 globalVar.rollerLineThree.agvArriveLineFour = false;
                 //线体四信号交互
@@ -4330,14 +5107,14 @@ namespace FryPot_DosingSystem.Control
                     //    Thread.Sleep(5); if (globalVar.ExitMainTask)
                     //        return;
                     //}
-                    MessageNotify.GetInstance.ShowRunLog($"炒锅【1】原料：【{OutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成"); break;
+                    MessageNotify.GetInstance.ShowRunLog($"炒锅【1】原料：【{OutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成"); break;
                 case 4:
                     //while (globalVar.fryPotFour.EmptyBarrelArrivedSingle == 0)
                     //{
                     //    Thread.Sleep(5); if (globalVar.ExitMainTask)
                     //        return;
                     //}
-                    MessageNotify.GetInstance.ShowRunLog($"炒锅【4】原料：【{OutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成"); break;
+                    MessageNotify.GetInstance.ShowRunLog($"炒锅【4】原料：【{OutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成"); break;
             }
         }
         /// <summary>
@@ -4353,14 +5130,14 @@ namespace FryPot_DosingSystem.Control
                     //    Thread.Sleep(5); if (globalVar.ExitMainTask)
                     //        return;
                     //}
-                    MessageNotify.GetInstance.ShowRunLog($"炒锅【2】原料：【{LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成"); break;
+                    MessageNotify.GetInstance.ShowRunLog($"炒锅【2】原料：【{LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成"); break;
                 case 5:
                     //while (globalVar.fryPotFive.EmptyBarrelArrivedSingle == 0)
                     //{
                     //    Thread.Sleep(5); if (globalVar.ExitMainTask)
                     //        return;
                     //}
-                    MessageNotify.GetInstance.ShowRunLog($"炒锅【5】原料：【{LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成"); break;
+                    MessageNotify.GetInstance.ShowRunLog($"炒锅【5】原料：【{LTwoOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成"); break;
             }
         }
         /// <summary>
@@ -4373,7 +5150,7 @@ namespace FryPot_DosingSystem.Control
             //    Thread.Sleep(5); if (globalVar.ExitMainTask)
             //        return;
             //}
-            MessageNotify.GetInstance.ShowRunLog($"炒锅【3】原料：【{LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialName}】空桶上料完成");
+            MessageNotify.GetInstance.ShowRunLog($"炒锅【3】原料：【{LThreeOutputMaterialQuene.ElementAt(0).materialType.MaterialLoc}】空桶上料完成");
         }
         /// <summary>
         /// 发送agv送料就位信号至PLC（线体到炒锅）
@@ -4623,7 +5400,7 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("1号滚筒线故障").LOneRollerTrouble == 0)
             {
-                if ((globalVar.agvArriveUpLoad||globalVar.LineOneRobotTaskError) && globalVar.LoadRoller && globalVar.rollerLineOne.StationEight == InputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.AgvToFryPot)//无故障
+                if ((globalVar.agvArriveUpLoad || globalVar.LineOneRobotTaskError) && globalVar.LoadRoller && globalVar.rollerLineOne.StationEight == InputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.AgvToFryPot)//无故障
                 {
 
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【1】号滚筒线装桶位置");
@@ -4631,8 +5408,14 @@ namespace FryPot_DosingSystem.Control
                     if (InputMaterialQuene.TryDequeue(out MaterialInfo materialInfo))
                     {
                         MessageNotify.GetInstance.ShowRunLog($"AGV正在装载{materialInfo.materialType.MaterialLoc}号料桶");
-
-                        globalVar.LOneCurrentCookingStep++;
+                        //if (materialInfo.materialType.MaterialLoc / 100 == 1)
+                        //{
+                        //    globalVar.LOneCurrentCookingStep++;
+                        //}
+                        //else
+                        //{
+                        //    globalVar.LFourCurrentCookingStep++;
+                        //}
                         OutputMaterialQuene.Enqueue(materialInfo);
                         globalVar.agvArriveUpLoad = false;
                         globalVar.AgvToFryPot = true;
@@ -4661,7 +5444,7 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("1号滚筒线故障").LOneRollerTrouble == 0)//无故障
             {
-                if (globalVar.agvArriveLineOneLoadEmptyRoller|| globalVar.LineSevenRobotTaskError)//agv到达上料位置
+                if (globalVar.agvArriveLineOneLoadEmptyRoller)//agv到达上料位置
                 {
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【1】号滚筒线装桶位置");
                     DeviceOperate.GetInstance.WritePlcData("D1052", 1);//agv到达线体1上料位置信号下发plc
@@ -4672,10 +5455,12 @@ namespace FryPot_DosingSystem.Control
                     globalVar.agvArriveLineOneLoadEmptyRoller = false;
                     //原料到位，agv到位，agv自行运料到清洗处
                 }
-                if (globalVar.agvArriveLineOneLoadCom|| globalVar.LineSevenRobotTaskError)//上料完成
+                if (globalVar.agvArriveLineOneLoadCom || globalVar.LineSevenRobotTaskError)//上料完成
                 {
+                    if (globalVar.LineSevenRobotTaskError)
+                        DeviceOperate.GetInstance.WritePlcData("D1052", 0);
                     if (emptyRollerNum != 0)
-                        globalVar.rollerLineOne.EmptyRollerNums.RemoveAt(0);
+                        globalVar.rollerLineOne.EmptyRollerNums.Remove(emptyRollerNum);
                     globalVar.agvArriveLineOneLoadCom = false;
                     globalVar.rollerLineOne.IsEpmtyBefore = false;
                     if (emptyRollerNum != 0)
@@ -4704,15 +5489,21 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("2号滚筒线故障").LTwoRollerTrouble == 0)//无故障
             {
-                if ((globalVar.agvArriveLTwoUpLoad||globalVar.LineTwoRobotTaskError) && globalVar.LTwoLoadRoller && globalVar.rollerLineTwo.StationEight == LTwoInputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.LTwoAgvToFryPot)//无故障
+                if ((globalVar.agvArriveLTwoUpLoad || globalVar.LineTwoRobotTaskError) && globalVar.LTwoLoadRoller && globalVar.rollerLineTwo.StationEight == LTwoInputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.LTwoAgvToFryPot)//无故障
                 {
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【2】号滚筒线装桶位置");
                     AgvArriveLineSingelSetDown(LTwoInputMaterialQuene);
                     if (LTwoInputMaterialQuene.TryDequeue(out MaterialInfo materialInfo))
                     {
                         MessageNotify.GetInstance.ShowRunLog($"AGV正在装载{materialInfo.materialType.MaterialLoc}号料桶");
-
-                        globalVar.LTwoCurrentCookingStep++;
+                        //if (materialInfo.materialType.MaterialLoc / 100 == 2)
+                        //{
+                        //    globalVar.LTwoCurrentCookingStep++;
+                        //}
+                        //else
+                        //{
+                        //    globalVar.LFiveCurrentCookingStep++;
+                        //}
                         LTwoOutputMaterialQuene.Enqueue(materialInfo);
                         globalVar.agvArriveLTwoUpLoad = false;
                         globalVar.LTwoAgvToFryPot = true;
@@ -4743,7 +5534,7 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("2号滚筒线故障").LTwoRollerTrouble == 0)//无故障
             {
-                if (globalVar.agvArriveLineTwoLoadEmptyRoller||globalVar.LineEightRobotTaskError)//agv到达上料位置
+                if (globalVar.agvArriveLineTwoLoadEmptyRoller)//agv到达上料位置
                 {
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【2】号滚筒线装桶位置");
                     DeviceOperate.GetInstance.WritePlcData("D1053", 1);//agv到达线体2上料位置信号下发plc
@@ -4757,8 +5548,10 @@ namespace FryPot_DosingSystem.Control
                 }
                 if (globalVar.agvArriveLineTwoLoadCom || globalVar.LineEightRobotTaskError)//上料完成
                 {
+                    if (globalVar.LineEightRobotTaskError)
+                        DeviceOperate.GetInstance.WritePlcData("D1053", 0);
                     if (emptyRollerNum != 0)
-                        globalVar.rollerLineTwo.EmptyRollerNums.RemoveAt(0);
+                        globalVar.rollerLineTwo.EmptyRollerNums.Remove(emptyRollerNum);
                     globalVar.agvArriveLineTwoLoadCom = false;
                     globalVar.rollerLineTwo.IsEpmtyBefore = false;
                     if (emptyRollerNum != 0)
@@ -4770,7 +5563,7 @@ namespace FryPot_DosingSystem.Control
                 while (AlarmHelper<AlarmInfo>.GetInstance("2号滚筒线故障").LTwoRollerTrouble == 1)
                 {
                     Thread.Sleep(1000);
-                    if (globalVar.ExitLineOneTask)
+                    if (globalVar.ExitLineTwoTask)
                         return;
                 }
                 MessageNotify.GetInstance.ShowRunLog("线体【2】滚筒故障解除，继续运行");
@@ -4787,7 +5580,7 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble == 0)//无故障
             {
-                if ((globalVar.agvArriveLThreeUpLoad||globalVar.LineThreeRobotTaskError) && globalVar.LThreeLoadRoller && globalVar.rollerLineThree.StationEight == LThreeInputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.LThreeAgvToFryPot)//无故障
+                if ((globalVar.agvArriveLThreeUpLoad || globalVar.LineThreeRobotTaskError) && globalVar.LThreeLoadRoller && globalVar.rollerLineThree.StationEight == LThreeInputMaterialQuene.ElementAt(0).materialType.MaterialLoc && !globalVar.LThreeAgvToFryPot)//无故障
                 {
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【3】号滚筒线装桶位置");
                     AgvArriveLineSingelSetDown(LThreeInputMaterialQuene);
@@ -4795,7 +5588,7 @@ namespace FryPot_DosingSystem.Control
                     {
                         MessageNotify.GetInstance.ShowRunLog($"AGV正在装载{materialInfo.materialType.MaterialLoc}号料桶");
 
-                        globalVar.LThreeCurrentCookingStep++;
+                        // globalVar.LThreeCurrentCookingStep++;
                         LThreeOutputMaterialQuene.Enqueue(materialInfo);
                         globalVar.agvArriveLThreeUpLoad = false;
                         globalVar.LThreeAgvToFryPot = true;
@@ -4826,7 +5619,7 @@ namespace FryPot_DosingSystem.Control
         {
         erp: if (AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble == 0)//无故障
             {
-                if (globalVar.agvArriveLineThreeLoadEmptyRoller||globalVar.LineNineRobotTaskError)//agv到达上料位置
+                if (globalVar.agvArriveLineThreeLoadEmptyRoller)//agv到达上料位置
                 {
                     MessageNotify.GetInstance.ShowRunLog("AGV到达【3】号滚筒线装桶位置");
                     DeviceOperate.GetInstance.WritePlcData("D1054", 1);//agv到达线体3上料位置信号下发plc
@@ -4841,8 +5634,10 @@ namespace FryPot_DosingSystem.Control
                 }
                 if (globalVar.agvArriveLineThreeLoadCom || globalVar.LineNineRobotTaskError)//上料完成
                 {
+                    if (globalVar.LineNineRobotTaskError)
+                        DeviceOperate.GetInstance.WritePlcData("D1054", 0);
                     if (emptyRollerNum != 0)
-                        globalVar.rollerLineThree.EmptyRollerNums.RemoveAt(0);
+                        globalVar.rollerLineThree.EmptyRollerNums.Remove(emptyRollerNum);
                     globalVar.agvArriveLineThreeLoadCom = false;
                     globalVar.rollerLineThree.IsEpmtyBefore = false;
                     if (emptyRollerNum != 0)
@@ -4854,7 +5649,7 @@ namespace FryPot_DosingSystem.Control
                 while (AlarmHelper<AlarmInfo>.GetInstance("3号滚筒线故障").LThreeRollerTrouble == 1)
                 {
                     Thread.Sleep(1000);
-                    if (globalVar.ExitLineOneTask)
+                    if (globalVar.ExitLineThreeTask)
                         return;
                 }
                 MessageNotify.GetInstance.ShowRunLog("线体【3】滚筒故障解除，继续运行");
@@ -4923,12 +5718,12 @@ namespace FryPot_DosingSystem.Control
             }
             else if (errorCode == "Analysis Error")
             {
-                MessageNotify.GetInstance.ShowRunLog($"提示：AGV去{num}号滚筒线API调用失败，请检查请求报文");
+                MessageNotify.GetInstance.ShowRunLog($"提示：AGV从清洗台到{num}号滚筒线API调用失败，请检查请求报文");
                 return false;
             }
             else
             {
-                MessageNotify.GetInstance.ShowRunLog($"提示：AGV去{num}号滚筒线失败，错误码:{errorCode}");
+                MessageNotify.GetInstance.ShowRunLog($"提示：AGV从清洗台到{num}号滚筒线失败，错误码:{errorCode}");
                 return false;
             }
         }
@@ -4941,17 +5736,17 @@ namespace FryPot_DosingSystem.Control
         {
             if (errorCode == "SUCCESS")
             {
-                MessageNotify.GetInstance.ShowRunLog($"AGV离开{num}号炒锅");
+                MessageNotify.GetInstance.ShowRunLog($"AGV去{num}号炒锅");
                 return true;
             }
             else if (errorCode == "Analysis Error")
             {
-                MessageNotify.GetInstance.ShowRunLog($"提示：AGV离开{num}号炒锅接口调用失败，请检查");
+                MessageNotify.GetInstance.ShowRunLog($"提示：AGV去{num}号炒锅接口调用失败，请检查");
                 return false;
             }
             else
             {
-                MessageNotify.GetInstance.ShowRunLog($"提示：AGV离开{num}号炒锅失败，错误码:{errorCode}");
+                MessageNotify.GetInstance.ShowRunLog($"提示：AGV去{num}号炒锅失败，错误码:{errorCode}");
                 return false;
             }
         }
@@ -5588,6 +6383,25 @@ namespace FryPot_DosingSystem.Control
             DeviceOperate.GetInstance.WriteRealPlcData("D1244", 0.0F);
             DeviceOperate.GetInstance.WriteRealPlcData("D1246", 0.0F);
         }
+        /// <summary>
+        /// 累加重量计算
+        /// </summary>
+        /// <param name="collect"></param>
+        public ushort SumAllTargetWeight(ObservableCollection<FlowProcessModel> collect,int length)
+        {
+            ushort total = 0;
+            if (collect.Count >= length)
+            {
+                for (int i = 0; i < length; i++)
+                {
+                   total += collect.ElementAt(i).TargeWeight;
+ 
+                }
+            }
+            return total;
+        }
+
+      
         /// <summary>
         /// 炒锅配方下发
         /// </summary>
@@ -5599,7 +6413,39 @@ namespace FryPot_DosingSystem.Control
             {
                 Json<FlowProcessNames>.Read();
                 #region  炒锅工艺下发
-                for (int i = 0; i < result.FlowProcess.fpModels.Count; i++)
+                int length = 0;
+                WritePotData(potNum,"D3920",Convert.ToUInt16(result.FlowProcess.targetWeightOffset*10));//目标重量偏差下发
+                if (result.FlowProcess.fpModels.FirstOrDefault(p => p.FryMaterialNum == "清洗") != null)
+                {
+                    WritePotData(potNum, "D3120", Convert.ToUInt16(result.FlowProcess.fpModels.Count - 1));//工序数量
+                    if (result.FlowProcess.fpModels.Count < 12)
+                    {
+                        length = result.FlowProcess.fpModels.Count - 1;
+                        WritePotData(potNum, "D3112", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).FryTemperature * 10));
+                        WritePotData(potNum, "D3113", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).FryPeriodTime * 600));
+                        WritePotData(potNum, "D3114", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).FryWeight * 10));//炒制重量
+                        WritePotData(potNum, "D3115", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).SmallFirePercent));
+                        WritePotData(potNum, "D3116", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).MidFirePercent));
+                        WritePotData(potNum, "D3117", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).BigFirePercent));
+                        WritePotData(potNum, "D3118", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).StrongFirePercent));
+                        WritePotData(potNum, "D3119", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).FrySpeed * 10));
+                        WritePotData(potNum, "D4121", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).TargeWeight*10)));//清洗目标重量
+                       
+                    }
+                    else
+                    {
+                        length = result.FlowProcess.fpModels.Count;
+                    }
+                }
+                else//没有编辑清洗
+                {
+                    length = result.FlowProcess.fpModels.Count;
+                    WritePotData(potNum, "D3120", Convert.ToUInt16(result.FlowProcess.fpModels.Count));//工序数量
+
+                }
+
+
+                for (int i = 0; i < length; i++)
                 {
                     bool can = ushort.TryParse(result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum, out ushort res);
                     //按工序下发数据
@@ -5620,13 +6466,14 @@ namespace FryPot_DosingSystem.Control
                                 case 6: WritePotData(potNum, "D3001", 7); WritePotData(potNum, "D3004", Convert.ToUInt16(result.materialCollection[5].MaterialWeight * 10)); break;
                                 case 7: WritePotData(potNum, "D3001", 8); WritePotData(potNum, "D3004", Convert.ToUInt16(result.materialCollection[6].MaterialWeight * 10)); break;
                                 case 8: WritePotData(potNum, "D3001", 9); WritePotData(potNum, "D3004", Convert.ToUInt16(result.materialCollection[7].MaterialWeight * 10)); break;
-
                             }
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3001", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3004", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
+  
                         }
 
                         WritePotData(potNum, "D3002", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryTemperature * 10));
@@ -5636,8 +6483,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3007", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3008", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3009", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4011", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序1目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序2
                     if (i == 1)
@@ -5660,6 +6510,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3011", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3014", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5671,8 +6522,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3017", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3018", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3019", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4021", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序2目标重量
+                      
                         continue;
                     }
+
                     #endregion
                     #region 工序3
                     if (i == 2)
@@ -5695,6 +6549,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3021", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3024", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5706,8 +6561,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3027", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3028", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3029", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4031", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序3目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序4
                     if (i == 3)
@@ -5730,6 +6588,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3031", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3034", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5741,8 +6600,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3037", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3038", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3039", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4041", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序4目标重量
+                      
                         continue;
                     }
+
                     #endregion
                     #region 工序5
                     if (i == 4)
@@ -5765,6 +6627,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3041", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3044", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5776,8 +6639,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3047", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3048", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3049", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4051", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序5目标重量
+                        
                         continue;
                     }
+
                     #endregion
                     #region 工序6
                     if (i == 5)
@@ -5800,6 +6666,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3051", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3054", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5811,8 +6678,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3057", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3058", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3059", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4061", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序6目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序7
                     if (i == 6)
@@ -5835,6 +6705,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3061", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3064", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5846,8 +6717,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3067", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3068", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3069", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4071", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序7目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序8
                     if (i == 7)
@@ -5870,6 +6744,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3071", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3074", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5881,8 +6756,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3077", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3078", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3079", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4081", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序8目标重量
+                        
                         continue;
                     }
+
                     #endregion
                     #region 工序9
                     if (i == 8)
@@ -5905,6 +6783,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3081", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3084", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5916,8 +6795,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3087", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3088", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3089", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4091", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序9目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序10
                     if (i == 9)
@@ -5939,6 +6821,7 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3091", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3094", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
                         }
@@ -5950,8 +6833,11 @@ namespace FryPot_DosingSystem.Control
                         WritePotData(potNum, "D3097", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3098", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3099", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                        WritePotData(potNum, "D4101", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序10目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序11
                     if (i == 10)
@@ -5973,57 +6859,72 @@ namespace FryPot_DosingSystem.Control
                         }
                         else
                         {
+
                             WritePotData(potNum, "D3101", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
                             WritePotData(potNum, "D3104", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
+
                         }
 
                         WritePotData(potNum, "D3102", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryTemperature * 10));
                         WritePotData(potNum, "D3103", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryPeriodTime * 600));
+
                         WritePotData(potNum, "D3105", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).SmallFirePercent));
                         WritePotData(potNum, "D3106", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).MidFirePercent));
                         WritePotData(potNum, "D3107", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
                         WritePotData(potNum, "D3108", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
                         WritePotData(potNum, "D3109", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+
+                        WritePotData(potNum, "D4111", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(i).TargeWeight * 10)));//工序11目标重量
+                       
                         continue;
                     }
+
                     #endregion
                     #region 工序12
                     if (i == 11)
                     {
-                        if (can)//是桶号
-                        {
-                            //发送桶号对应的ID以及物料重量
-                            switch (res % 100)
-                            {
-                                case 1: WritePotData(potNum, "D3111", 2); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[0].MaterialWeight * 10)); break;
-                                case 2: WritePotData(potNum, "D3111", 3); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[1].MaterialWeight * 10)); break;
-                                case 3: WritePotData(potNum, "D3111", 4); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[2].MaterialWeight * 10)); break;
-                                case 4: WritePotData(potNum, "D3111", 5); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[3].MaterialWeight * 10)); break;
-                                case 5: WritePotData(potNum, "D3111", 6); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[4].MaterialWeight * 10)); break;
-                                case 6: WritePotData(potNum, "D3111", 7); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[5].MaterialWeight * 10)); break;
-                                case 7: WritePotData(potNum, "D3111", 8); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[6].MaterialWeight * 10)); break;
-                                case 8: WritePotData(potNum, "D3111", 9); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[7].MaterialWeight * 10)); break;
-                            }
-                        }
-                        else
+                        //if (can)//是桶号
+                        //{
+                        //    //发送桶号对应的ID以及物料重量
+                        //    switch (res % 100)
+                        //    {
+                        //        case 1: WritePotData(potNum, "D3111", 2); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[0].MaterialWeight * 10)); break;
+                        //        case 2: WritePotData(potNum, "D3111", 3); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[1].MaterialWeight * 10)); break;
+                        //        case 3: WritePotData(potNum, "D3111", 4); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[2].MaterialWeight * 10)); break;
+                        //        case 4: WritePotData(potNum, "D3111", 5); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[3].MaterialWeight * 10)); break;
+                        //        case 5: WritePotData(potNum, "D3111", 6); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[4].MaterialWeight * 10)); break;
+                        //        case 6: WritePotData(potNum, "D3111", 7); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[5].MaterialWeight * 10)); break;
+                        //        case 7: WritePotData(potNum, "D3111", 8); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[6].MaterialWeight * 10)); break;
+                        //        case 8: WritePotData(potNum, "D3111", 9); WritePotData(potNum, "D3114", Convert.ToUInt16(result.materialCollection[7].MaterialWeight * 10)); break;
+                        //    }
+                        //}
+                        //else
+                        //{
+
+
+                        //}
+                        if (result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum == "清洗")
                         {
-                            WritePotData(potNum, "D3111", Convert.ToUInt16(Json<FlowProcessNames>.Data.NameId[result.FlowProcess.fpModels.ElementAt(i).FryMaterialNum]));
+                            WritePotData(potNum, "D3112", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryTemperature * 10));
+                            WritePotData(potNum, "D3113", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryPeriodTime * 600));
                             WritePotData(potNum, "D3114", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryWeight * 10));//炒制重量
+                            WritePotData(potNum, "D3115", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).SmallFirePercent));
+                            WritePotData(potNum, "D3116", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).MidFirePercent));
+                            WritePotData(potNum, "D3117", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
+                            WritePotData(potNum, "D3118", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
+                            WritePotData(potNum, "D3119", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+                            WritePotData(potNum, "D4121", Convert.ToUInt16((result.FlowProcess.fpModels.ElementAt(result.FlowProcess.fpModels.Count - 1).TargeWeight * 10)));//清洗目标重量
+                         
                         }
 
-                        WritePotData(potNum, "D3112", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryTemperature * 10));
-                        WritePotData(potNum, "D3113", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FryPeriodTime * 600));
-                        WritePotData(potNum, "D3115", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).SmallFirePercent));
-                        WritePotData(potNum, "D3116", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).MidFirePercent));
-                        WritePotData(potNum, "D3117", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).BigFirePercent));
-                        WritePotData(potNum, "D3118", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).StrongFirePercent));
-                        WritePotData(potNum, "D3119", Convert.ToUInt16(result.FlowProcess.fpModels.ElementAt(i).FrySpeed * 10));
+
                         continue;
                     }
+
                     #endregion
                 }
-                WritePotData(potNum, "D3120", Convert.ToUInt16(result.FlowProcess.fpModels.Count));//工序数量
-                #endregion 
+
+                #endregion
             }
 
         }
@@ -6042,6 +6943,7 @@ namespace FryPot_DosingSystem.Control
                     for (int i = 1; i < 10; i++)
                     {
                         WritePotData(PotNum, "D300" + i, 0);
+                       
                     }
                     for (int i = 11; i < 20; i++)
                     {
@@ -6083,9 +6985,230 @@ namespace FryPot_DosingSystem.Control
                     {
                         WritePotData(PotNum, "D3" + i, 0);
                     }
+
+                    #region 目标重量清零
+                    for (int i = 1; i < 10; i++)
+                    {
+                        WritePotData(PotNum, "D40" + i + "1", 0);
+                    }
+                    for (int i = 0; i < 3; i++)
+                    {
+                        WritePotData(PotNum, "D41" + i + "1", 0);
+                    } 
+                    #endregion
                     WritePotData(PotNum, "D3120", 0);
+                    WritePotData(PotNum,"D3920",0);//目标重量清零
+                    
+                }
+            }
+
+        }
+
+        int PotOnestep = 0;
+        int PotFourstep = 0;
+        int PotTwostep = 0;
+        int PotFivestep = 0;
+        int PotThreestep = 0;
+
+        public void LOneFryPotStepDisplay()
+        {
+
+            try
+            {
+                if (PotOnestep != globalVar.fryPotOne.ProcessStep && globalVar.fryPotOne.ProcessStep != 0 && potOneCurrentRecipe != null)
+                {
+                    if (globalVar.fryPotOne.ProcessStep == 20)
+                    {
+                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep + 1, Name = "正在出料", isBool = IsBool.Yes }); }));
+                       
+                    }
+                    else
+                    {
+                        if (potOneCurrentRecipe.FlowProcess.fpModels.Count > 0 && globalVar.fryPotOne.ProcessStep != 12 && globalVar.fryPotOne.ProcessStep != 13)
+                        {
+                            try
+                            {
+                                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep + 1, Name = potOneCurrentRecipe.FlowProcess.fpModels.ElementAt(globalVar.fryPotOne.ProcessStep - 1).FryMaterialNum, isBool = IsBool.Yes }); }));
+                                
+                            }
+                            catch (Exception)
+                            {
+
+                                //throw;
+                            }
+                        }
+                        else if (globalVar.fryPotOne.ProcessStep == 12)
+                        {
+                            Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_1.workflows.Add(new WorkflowModel { id = globalVar.LOneCurrentCookingStep + 1, Name = "清洗", isBool = IsBool.Yes }); }));
+                            
+                        }
+                        globalVar.LOneCurrentCookingStep++;
+                    }
+
+                    PotOnestep = globalVar.fryPotOne.ProcessStep;
+                }
+                if (PotFourstep != globalVar.fryPotFour.ProcessStep && globalVar.fryPotFour.ProcessStep != 0 && potFourCurrentRecipe != null)
+                {
+                    if (globalVar.fryPotFour.ProcessStep == 20)
+                    {
+                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LFourCurrentCookingStep + 1, Name = "正在出料", isBool = IsBool.Yes }); }));
+                       
+                    }
+                    else
+                    {
+                        if (potFourCurrentRecipe.FlowProcess.fpModels.Count > 0 && globalVar.fryPotFour.ProcessStep != 12 && globalVar.fryPotFour.ProcessStep != 13)
+                        {
+                            try
+                            {
+                                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LFourCurrentCookingStep + 1, Name = potFourCurrentRecipe.FlowProcess.fpModels.ElementAt(globalVar.fryPotFour.ProcessStep - 1).FryMaterialNum, isBool = IsBool.Yes }); }));
+                                
+                            }
+                            catch (Exception)
+                            {
+
+                                // throw;
+                            }
+                        }
+                        else if (globalVar.fryPotFour.ProcessStep == 12)
+                        {
+                            Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_4.workflows.Add(new WorkflowModel { id = globalVar.LFourCurrentCookingStep + 1, Name = "清洗", isBool = IsBool.Yes }); }));
+                            
+
+                        }
+                        globalVar.LFourCurrentCookingStep++;
+
+                    }
+                    PotFourstep = globalVar.fryPotFour.ProcessStep;
+                }
+            }
+            catch (Exception)
+            {
+
+                // throw;
+            }
+        }
+        public void LTwoFryPotStepDisplay()
+        {
+
+            try
+            {
+                if (PotTwostep != globalVar.fryPotTwo.ProcessStep && globalVar.fryPotTwo.ProcessStep != 0 && potTwoCurrentRecipe != null)
+                {
+                    if (globalVar.fryPotTwo.ProcessStep == 20)
+                    {
+                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep + 1, Name = "正在出料", isBool = IsBool.Yes }); }));
+                       
+                    }
+                    else
+                    {
+                        if (potTwoCurrentRecipe.FlowProcess.fpModels.Count > 0 && globalVar.fryPotTwo.ProcessStep != 12 && globalVar.fryPotTwo.ProcessStep != 13)
+                        {
+                            try
+                            {
+                                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep + 1, Name = potTwoCurrentRecipe.FlowProcess.fpModels.ElementAt(globalVar.fryPotTwo.ProcessStep - 1).FryMaterialNum, isBool = IsBool.Yes }); }));
+                                
+                            }
+                            catch (Exception)
+                            {
+
+                                //throw;
+                            }
+                        }
+                        else if (globalVar.fryPotTwo.ProcessStep == 12)
+                        {
+
+                            Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_2.workflows.Add(new WorkflowModel { id = globalVar.LTwoCurrentCookingStep + 1, Name = "清洗", isBool = IsBool.Yes }); }));
+                          
+                        }
+                        globalVar.LTwoCurrentCookingStep++;
+                    }
+                    PotTwostep = globalVar.fryPotTwo.ProcessStep;
+                }
+                if (PotFivestep != globalVar.fryPotFive.ProcessStep && globalVar.fryPotFive.ProcessStep != 0 && potFiveCurrentRecipe != null)
+                {
+                    if (globalVar.fryPotFive.ProcessStep == 20)
+                    {
+                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LFiveCurrentCookingStep + 1, Name = "正在出料", isBool = IsBool.Yes }); }));
+                       
+                        globalVar.LFiveCurrentCookingStep++;
+                    }
+                    else
+                    {
+                        if (potFiveCurrentRecipe.FlowProcess.fpModels.Count > 0 && globalVar.fryPotFive.ProcessStep != 12 && globalVar.fryPotFive.ProcessStep != 13)
+                        {
+
+                            try
+                            {
+                                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LFiveCurrentCookingStep + 1, Name = potFiveCurrentRecipe.FlowProcess.fpModels.ElementAt(globalVar.fryPotFive.ProcessStep - 1).FryMaterialNum, isBool = IsBool.Yes }); }));
+                                
+                            }
+                            catch (Exception)
+                            {
+
+                                //throw;
+                            }
+                        }
+                        else if (globalVar.fryPotFive.ProcessStep == 12)
+                        {
+                            Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_5.workflows.Add(new WorkflowModel { id = globalVar.LFiveCurrentCookingStep + 1, Name = "清洗", isBool = IsBool.Yes }); }));
+                            
+                        }
+                        globalVar.LFiveCurrentCookingStep++;
+                    }
+
+                    PotFivestep = globalVar.fryPotFive.ProcessStep;
+                }
+            }
+            catch (Exception)
+            {
+
+                //throw;
+            }
+        }
+        public void LThreeFryPotStepDisplay()
+        {
+
+            try
+            {
+
+                if (PotThreestep != globalVar.fryPotThree.ProcessStep && globalVar.fryPotThree.ProcessStep != 0 && potThreeCurrentRecipe != null)
+                {
+                    if (globalVar.fryPotThree.ProcessStep == 20)
+                    {
+                        Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep + 1, Name = "正在出料", isBool = IsBool.Yes }); }));
+                      
+                    }
+                    else
+                    {
+                        if (potThreeCurrentRecipe.FlowProcess.fpModels.Count > 0 && globalVar.fryPotThree.ProcessStep != 12 && globalVar.fryPotThree.ProcessStep != 13)
+                        {
+                            try
+                            {
+                                Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep + 1, Name = potThreeCurrentRecipe.FlowProcess.fpModels.ElementAt(globalVar.fryPotThree.ProcessStep - 1).FryMaterialNum, isBool = IsBool.Yes }); }));
+                               
+                            }
+                            catch (Exception)
+                            {
+
+                                //throw;
+                            }
+                        }
+                        else if (globalVar.fryPotThree.ProcessStep == 12)
+                        {
+                            Application.Current.Dispatcher.Invoke(new Action(() => { AgvViewModel.GetInstance().wokModel_3.workflows.Add(new WorkflowModel { id = globalVar.LThreeCurrentCookingStep + 1, Name = "清洗", isBool = IsBool.Yes }); }));
+                           
+                        }
+                        globalVar.LThreeCurrentCookingStep++;
+                    }
+
+                    PotThreestep = globalVar.fryPotThree.ProcessStep;
                 }
             }
+            catch (Exception)
+            {
+
+                //throw;
+            }
 
         }
     }
diff --git a/FryPot_DosingSystem/Control/GlobalVariable.cs b/FryPot_DosingSystem/Control/GlobalVariable.cs
index 3c05105b..445ac4f8 100644
--- a/FryPot_DosingSystem/Control/GlobalVariable.cs
+++ b/FryPot_DosingSystem/Control/GlobalVariable.cs
@@ -131,6 +131,7 @@ namespace FryPot_DosingSystem.Control
         public bool LoadRoller { get; set; }
 
         public bool AgvToFryPot { get; set; }
+       
 
         public bool PotOneInputMaterialArrive { get; set; }
         public bool PotOneOutputRollerArrive { get; set; }
@@ -160,14 +161,19 @@ namespace FryPot_DosingSystem.Control
        public int LOneMaterialNum { get; set; } = 0;
        public int LOneFryPotSerial { get; set; } = 0;
         public int LOneCurrentCookingStep { get; set; } = 0;
+        public int LFourCurrentCookingStep { get; set; } = 0;
         public bool agvArriveUpLoad { get; set; }
         public bool agvArriveUnLoad { get; set; }
         public bool agvFryPotEmptyRollerArrive { get; set; }
         public bool EmptyRollerUnLoadcCom { get; set; }//AGV空桶4号线体下料完成
-        public bool agvLineOneLoadCom { get; set; }//线体1上料完成
+        public bool agvLineOneLoadCom { get; set; }//线体1满料桶上料完成
+        //2022.11.1 新增
+     
+
 
        public int LTwoMaterialNum { get; set; } = 0;
        public int LTwoFryPotSerial { get; set; } =0;
+        public int LFiveCurrentCookingStep { get; set; } = 0;
         public int LTwoCurrentCookingStep { get; set; } = 0;
         public bool agvArriveLTwoUpLoad { get; set; }
         public bool LTwoagvArriveUnLoad { get; set; }
diff --git a/FryPot_DosingSystem/Model/FlowProcessManage.cs b/FryPot_DosingSystem/Model/FlowProcessManage.cs
index d27924cb..b09c707f 100644
--- a/FryPot_DosingSystem/Model/FlowProcessManage.cs
+++ b/FryPot_DosingSystem/Model/FlowProcessManage.cs
@@ -11,6 +11,8 @@ namespace FryPot_DosingSystem.Model
     internal class FlowProcessManage:ObservableObject
     {
         public string RecipeName { get; set; }
+        public float targetWeightOffset { get { return _targetWeightOffset; } set { _targetWeightOffset = value;OnPropertyChanged(); }}
+        private float _targetWeightOffset;
         public ObservableCollection<FlowProcessModel> fpModels { get; set; } = new ObservableCollection<FlowProcessModel>();
     }
 }
diff --git a/FryPot_DosingSystem/Model/FlowProcessModel.cs b/FryPot_DosingSystem/Model/FlowProcessModel.cs
index 65b73017..9b2b2e3a 100644
--- a/FryPot_DosingSystem/Model/FlowProcessModel.cs
+++ b/FryPot_DosingSystem/Model/FlowProcessModel.cs
@@ -30,11 +30,16 @@ namespace FryPot_DosingSystem.Model
         public double FrySpeed { get { return _frySpeed; }set { _frySpeed = value;OnPropertyChanged(); } }
         private double _frySpeed;
         /// <summary>
-        /// 炒制重量
+        /// 添加重量
         /// </summary>
         public double FryWeight { get { return _fryMaterialWeight; } set { _fryMaterialWeight = value; OnPropertyChanged(); } }
         private double _fryMaterialWeight;
         /// <summary>
+        /// 目标重量
+        /// </summary>
+        public ushort TargeWeight { get { return _targetWeight; }set { _targetWeight = value;OnPropertyChanged(); } }
+        private ushort _targetWeight;
+        /// <summary>
         /// 炒制温度
         /// </summary>
         public double FryTemperature { get { return _fryTemperature; } set { _fryTemperature = value;OnPropertyChanged(); } }
diff --git a/FryPot_DosingSystem/View/AgvView.xaml b/FryPot_DosingSystem/View/AgvView.xaml
index 25325e98..5b46b97b 100644
--- a/FryPot_DosingSystem/View/AgvView.xaml
+++ b/FryPot_DosingSystem/View/AgvView.xaml
@@ -566,7 +566,7 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            
+
 
             <Style x:Key="停车位"  BasedOn="{x:Null}" TargetType="{x:Type TextBox}">
                 <Setter Property="Foreground" Value="#FF1F4D69"/>
@@ -1344,7 +1344,7 @@
     <Grid>
 
         <!--#region 测试按钮-->
-        <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="100,0,100,80" Grid.Column="2">
+        <!--<Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="100,0,100,80" Grid.Column="2">
             <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="0"/>
             <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,20,0" Orientation="Horizontal">
                 <TextBlock Style="{DynamicResource 80号字体样式}"  Text="AGV模拟测试" Margin="20,20,20,5" Width="35" FontSize="20"  Foreground="#FFFCD5B5" />
@@ -1353,6 +1353,7 @@
                     <TextBox x:Name="tcz_text" Margin="5">1</TextBox>
                     <Button Margin="5" Click="Button_Click" Tag="设置有车" Cursor="Hand">设置有车</Button>
                     <Button Margin="5" Click="Button_Click" Tag="设置无车" Cursor="Hand">设置无车</Button>
+                   
                 </StackPanel>
 
                 <StackPanel>
@@ -1395,7 +1396,7 @@
                 </StackPanel>
 
             </StackPanel>
-        </Grid>
+        </Grid>-->
 
 
         <!--#endregion-->
@@ -1530,124 +1531,166 @@
                 <TextBox Style="{StaticResource 炒锅}" Text="{Binding wokModel_5.Text,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                 <TextBlock Style="{DynamicResource 80号字体样式}" FontSize="16" Width="18" Margin="-10,0,0,0"  HorizontalAlignment="Left" VerticalAlignment="Bottom">炒锅(5)号</TextBlock>
             </Grid>
-            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="0">
+            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="0" Height="360">
                 <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10"/>
-                <StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="一号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="105"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="一号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
+                        <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  
                                    Text="{Binding wokModel_1.goodsName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    Tag="{Binding wokModel_1.id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    ToolTip="{Binding wokModel_1.orderID,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center"  Foreground="#FF00FFED" />
+                        </StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
                     </StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <ListBox ItemsSource="{Binding wokModel_1.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
+                    <Grid Grid.Row="1">
+                        <ListBox x:Name="potOne" ItemsSource="{Binding wokModel_1.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10" ScrollViewer.VerticalScrollBarVisibility="Visible">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </Grid>
+
             </Grid>
-            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="1">
+            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="1" Height="360">
                 <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10"/>
-                <StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="二号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="105"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="二号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
+                        <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  
                                    Text="{Binding wokModel_2.goodsName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    Tag="{Binding wokModel_2.id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    ToolTip="{Binding wokModel_2.orderID,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center"  Foreground="#FF00FFED" />
+                        </StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
                     </StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <ListBox ItemsSource="{Binding wokModel_2.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
+                    <Grid Grid.Row="1">
+                        <ListBox x:Name="potTwo" ItemsSource="{Binding wokModel_2.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10" ScrollViewer.VerticalScrollBarVisibility="Visible">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </Grid>
             </Grid>
-            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="2">
-                <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10"/>
-                <StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="三号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  
+            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="2" Height="360">
+
+                <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10" />
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="105"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel >
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="三号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
+                        <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  
                                    Text="{Binding wokModel_3.goodsName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    Tag="{Binding wokModel_3.id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    ToolTip="{Binding wokModel_3.orderID,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center"  Foreground="#FF00FFED" />
+                        </StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
                     </StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <ListBox ItemsSource="{Binding wokModel_3.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
+                    <Grid Grid.Row="1">
+                        <ListBox x:Name="potThree"  ItemsSource="{Binding wokModel_3.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10" ScrollViewer.VerticalScrollBarVisibility="Visible" >
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
+                                    </StackPanel>
+
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </Grid>
             </Grid>
-            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="3">
+            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="3"  Height="360">
                 <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10"/>
-                <StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="四号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="105"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="四号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
+                        <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  
                                    Text="{Binding wokModel_4.goodsName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    Tag="{Binding wokModel_4.id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    ToolTip="{Binding wokModel_4.orderID,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center"  Foreground="#FF00FFED" />
+                        </StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
                     </StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <ListBox ItemsSource="{Binding wokModel_4.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
-                                    <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
+                    <Grid Grid.Row="1">
+                        <ListBox x:Name="potFour" ItemsSource="{Binding wokModel_4.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10" ScrollViewer.VerticalScrollBarVisibility="Visible">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding xh,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  FontSize="16"  Foreground="#FF00FFB3" />
+                                        <Image Margin="20,0,0,0" Style="{DynamicResource image完成}" Visibility="{Binding visibility,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></Image>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </Grid>
             </Grid>
-            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="4">
-                <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10"/>
-                <StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="五号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
-                        <TextBlock Style="{DynamicResource 80号字体样式}"  
+            <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="100,0,-40,80" Grid.Column="4" Height="360">
+                <Rectangle Stroke="#FFFFA400" StrokeDashArray="5 5" Margin="10" />
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="105"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="五号炒锅制作流程" Margin="20,20,20,5" FontSize="20"  Foreground="#FFFCD5B5" />
+                        <StackPanel Orientation="Horizontal" Margin="20,5,20,0">
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  Text="菜品："  FontSize="20"  Foreground="#FFFCD5B5" />
+                            <TextBlock Style="{DynamicResource 80号字体样式}"  
                                    Text="{Binding wokModel_5.goodsName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    Tag="{Binding wokModel_5.id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    ToolTip="{Binding wokModel_5.orderID,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                                    FontSize="16" HorizontalAlignment="Left" VerticalAlignment="Center"  Foreground="#FF00FFED" />
+                        </StackPanel>
+                        <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
                     </StackPanel>
-                    <TextBlock Style="{DynamicResource 80号字体样式}"  Text="步骤：" Margin="20,5,20,0" FontSize="20"  Foreground="#FFFCD5B5" />
-                    <ListBox ItemsSource="{Binding wokModel_5.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10">
+                    <Grid Grid.Row="1">
+                        <ListBox x:Name="potFive" ItemsSource="{Binding wokModel_5.workflows,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Margin="0,0,0,10" ScrollViewer.VerticalScrollBarVisibility="Visible">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Margin="15,5,15,5">
@@ -1657,8 +1700,9 @@
                                 </StackPanel>
                             </DataTemplate>
                         </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
+                        </ListBox>
+                    </Grid>
+                </Grid>
             </Grid>
         </Grid>
 
@@ -1733,7 +1777,7 @@
                             <LinearGradientBrush>
                                 <GradientStop Offset="0.3" Color="Gray"/>
                                 <GradientStop Offset="0.7" Color="White"/>
-                               
+
                             </LinearGradientBrush>
                         </Path.Fill>
                         <Path.Data>
diff --git a/FryPot_DosingSystem/View/AgvView.xaml.cs b/FryPot_DosingSystem/View/AgvView.xaml.cs
index 25342b6a..4acb90f0 100644
--- a/FryPot_DosingSystem/View/AgvView.xaml.cs
+++ b/FryPot_DosingSystem/View/AgvView.xaml.cs
@@ -1,4 +1,6 @@
-using FryPot_DosingSystem.AGV;
+
+using BPASmartClient.Helper;
+using FryPot_DosingSystem.AGV;
 using FryPot_DosingSystem.ViewModel;
 using System;
 using System.Collections.Generic;
@@ -23,177 +25,209 @@ namespace FryPot_DosingSystem.View
     /// </summary>
     public partial class AgvView : UserControl
     {
+        private static readonly object O_lock = new object();
         public AgvView()
         {
             InitializeComponent();
             this.DataContext = AgvViewModel.GetInstance();
-            控制命令.ItemsSource = AgvViewModel.GetInstance().GetCommand();
-        }
+           // 控制命令.ItemsSource = AgvViewModel.GetInstance().GetCommand();
 
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            int id = 1;
-            if (sender is Button)
-            {
-                byte[] data;
-                bool istrue = false;
-                Button button = sender as Button;
-                if (button.Tag != null)
-                {
-                    switch (button.Tag.ToString())
-                    {
-                        case "设置有车":
-                            try
-                            {
-                                id=int.Parse(tcz_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-5 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set停车桩(id, IsBool.Yes);
-                            break;
-                        case "设置无车":
-                            
-                            try
-                            {
-                                id = int.Parse(tcz_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-5 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set停车桩(id, IsBool.No);
-                            break;
-                        case "启动":
-                            try
-                            {
-                                id = int.Parse(liaotong_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Start);
-                            break;
-                        case "停止":
-                            try
-                            {
-                                id = int.Parse(liaotong_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Stop);
-                            break;
-                        case "设置物料":
-                            try
-                            {
-                                id = int.Parse(liaotongwuliao_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-8 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set滚筒线上数量(id, liaotongwuliaoshuliang_text.Text);
-                            break;
-                        case "小车停止":
-                            try
-                            {
-                                id = int.Parse(xiaoche_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set小车停止(id);
-                            break;
-                        case "运行小车":
-                            try
-                            {
-                                id = int.Parse(xiaoche_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set小车运动(id, AgvViewModel.GetInstance().GetCommandValue(控制命令.Text));
-                            break;
-                        case "有菜和碗":
-                            try
-                            {
-                                id = int.Parse(xiaochewuping_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.Yes);
-                            break;
-                        case "只有碗":
-                            try
-                            {
-                                id = int.Parse(xiaochewuping_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.OnllYes);
-                            break;
-                        case "无物品":
-                            try
-                            {
-                                id = int.Parse(xiaochewuping_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.No);
-                            break;
-                        case "启动炒锅":
-                            try
-                            {
-                                id = int.Parse(guntongchaoguo_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set启动或停止炒锅(id, IsRun.Start);
-                            break;
-                        case "停止炒锅":
-                            try
-                            {
-                                id = int.Parse(guntongchaoguo_text.Text.ToString());
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("只能输入 1-4 的数字！");
-                                return;
-                            }
-                            AgvViewModel.GetInstance().Set启动或停止炒锅(id, IsRun.Stop);
-                            break;
-                        case "清洗桶数":
-                            AgvViewModel.GetInstance().SetCleanRollerNum(2);
-                            break;
-                    }
-                }
-            }
+         
         }
+        //public void PotDisplay(object num)
+        //{
+        //    lock (O_lock)
+        //    {
+        //        switch (num)
+        //        {
+        //            case 1:
+        //                potOne.Items.MoveCurrentToLast();
+        //                potOne.ScrollIntoView(potOne.Items.CurrentItem); break;
+        //            case 2:
+        //                potTwo.Items.MoveCurrentToLast();
+        //                potTwo.ScrollIntoView(potTwo.Items.CurrentItem); break;
+        //            case 3:
+        //                potThree.Items.MoveCurrentToLast();
+        //                potThree.ScrollIntoView(potThree.Items.CurrentItem); break;
+        //            case 4:
+        //                potFour.Items.MoveCurrentToLast();
+        //                potFour.ScrollIntoView(potFour.Items.CurrentItem); break;
+        //            case 5:
+        //                potFive.Items.MoveCurrentToLast();
+        //                potFive.ScrollIntoView(potFive.Items.CurrentItem); break;
+
+        //        } 
+        //    }
+
+        //}
+      
+
+
+
+        //private void Button_Click(object sender, RoutedEventArgs e)
+        //{
+        //    int id = 1;
+        //    if (sender is Button)
+        //    {
+        //        byte[] data;
+        //        bool istrue = false;
+        //        Button button = sender as Button;
+        //        if (button.Tag != null)
+        //        {
+        //            switch (button.Tag.ToString())
+        //            {
+        //                case "设置有车":
+        //                    try
+        //                    {
+        //                        id = int.Parse(tcz_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-5 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set停车桩(id, IsBool.Yes);
+        //                    break;
+        //                case "设置无车":
 
+        //                    try
+        //                    {
+        //                        id = int.Parse(tcz_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-5 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set停车桩(id, IsBool.No);
+        //                    break;
+        //                case "启动":
+        //                    try
+        //                    {
+        //                        id = int.Parse(liaotong_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Start);
+        //                    break;
+        //                case "停止":
+        //                    try
+        //                    {
+        //                        id = int.Parse(liaotong_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set滚筒线状态(id, IsRun.Stop);
+        //                    break;
+        //                case "设置物料":
+        //                    try
+        //                    {
+        //                        id = int.Parse(liaotongwuliao_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-8 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set滚筒线上数量(id, liaotongwuliaoshuliang_text.Text);
+        //                    break;
+        //                case "小车停止":
+        //                    try
+        //                    {
+        //                        id = int.Parse(xiaoche_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set小车停止(id);
+        //                    break;
+        //                case "运行小车":
+        //                    try
+        //                    {
+        //                        id = int.Parse(xiaoche_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set小车运动(id, AgvViewModel.GetInstance().GetCommandValue(控制命令.Text));
+        //                    break;
+        //                case "有菜和碗":
+        //                    try
+        //                    {
+        //                        id = int.Parse(xiaochewuping_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.Yes);
+        //                    break;
+        //                case "只有碗":
+        //                    try
+        //                    {
+        //                        id = int.Parse(xiaochewuping_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.OnllYes);
+        //                    break;
+        //                case "无物品":
+        //                    try
+        //                    {
+        //                        id = int.Parse(xiaochewuping_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set小车是否承载物品(id, IsBool.No);
+        //                    break;
+        //                case "启动炒锅":
+        //                    try
+        //                    {
+        //                        id = int.Parse(guntongchaoguo_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set启动或停止炒锅(id, IsRun.Start);
+        //                    break;
+        //                case "停止炒锅":
+        //                    try
+        //                    {
+        //                        id = int.Parse(guntongchaoguo_text.Text.ToString());
+        //                    }
+        //                    catch (Exception ex)
+        //                    {
+        //                        MessageBox.Show("只能输入 1-4 的数字！");
+        //                        return;
+        //                    }
+        //                    AgvViewModel.GetInstance().Set启动或停止炒锅(id, IsRun.Stop);
+        //                    break;
+        //                case "清洗桶数":
+        //                    AgvViewModel.GetInstance().SetCleanRollerNum(2);
+        //                    break;
+        //            }
+        //        }
+        //    }
+        //}
+       
     }
 }
diff --git a/FryPot_DosingSystem/View/DebugView.xaml b/FryPot_DosingSystem/View/DebugView.xaml
index fd8f8a15..865b7a67 100644
--- a/FryPot_DosingSystem/View/DebugView.xaml
+++ b/FryPot_DosingSystem/View/DebugView.xaml
@@ -11,18 +11,24 @@
         <vm:DebugViewModel/>
     </UserControl.DataContext>
     <UserControl.Resources>
-        <Style x:Key="buttonStyle" TargetType="Button">
-            <Setter Property="Width" Value="100"></Setter>
-            <Setter Property="Height" Value="30"/>
-            <Setter Property="Background" Value="Transparent"></Setter>
-            <Setter Property="BorderThickness" Value="2"/>
-            <Setter Property="BorderBrush" Value="Orange"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Margin" Value="3,3"/>
-            <Setter Property="Foreground" Value="SkyBlue"/>
-            <Setter Property="FontSize" Value="13"/>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <!--<Style x:Key="buttonStyle" TargetType="Button">
+                <Setter Property="Width" Value="100"></Setter>
+                <Setter Property="Height" Value="30"/>
+                <Setter Property="Background" Value="Transparent"></Setter>
+                <Setter Property="BorderThickness" Value="2"/>
+                <Setter Property="BorderBrush" Value="Orange"/>
+                <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Margin" Value="3,3"/>
+                <Setter Property="Foreground" Value="SkyBlue"/>
+                <Setter Property="FontSize" Value="13"/>
+            </Style>-->
+        </ResourceDictionary>
     </UserControl.Resources>
 
     <Grid>
@@ -30,47 +36,54 @@
             <RowDefinition/>
             <RowDefinition/>
             <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition/>
         </Grid.RowDefinitions>
         <UniformGrid Columns="2">
-            <GroupBox Grid.Column="1" Header="PLC信号" Foreground="Aqua" BorderBrush="Pink">
+            <GroupBox Grid.Column="1" Header="1号滚筒线" Foreground="Aqua" BorderBrush="Pink">
                 <WrapPanel Orientation="Horizontal">
-                        <Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineRunning}"></Button>
-                        <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--<Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineRunning}"></Button>
+                        -->
+                    <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--
                         <ComboBox SelectionChanged="ComboBox_SelectionChanged" ItemsSource="{Binding LineOneRollerCode}" Background="Transparent" Width="100" Height="34" Margin="3,3"/>
                         <Button Content="炒锅进料就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotInputArrive}"/>
                         <Button Content="炒锅空桶就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotEmptyRollerArrive}"/>
                     <Button Content="配方完成信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineOneRecipeComSignal}"/>
-                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <Button Content="线体1任务重置" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineOneTaskExit}"></Button>
-                   
-                    <Button Content="空桶清洗任务重置" Width="140" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EmptyRollerCleanTaskRestart}"/>
-                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <WrapPanel Orientation="Horizontal">
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+                    <Button Margin="3,3" Content="线体1任务重置"  VerticalAlignment="Top" Command="{Binding LineOneTaskExit}"></Button>
+
+                    <Button Margin="3,3" Content="空桶清洗任务重置" Width="140"  VerticalAlignment="Top" Command="{Binding EmptyRollerCleanTaskRestart}"/>
+
+                    <Button Content="线体1出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_34" Width="145"/>
+                    <Button Content="线体1出桶复位" Width="140" Click="Button_Click_15" Margin="3,3" VerticalAlignment="Top" />
+
+                    <Button Content="AGV线体1上料就位" Margin="3,3" Width="120" Command="{Binding AGVLOneArrive}"/>
+
+                    <Button Content="AGV线体1空桶上料就位" Margin="3,3" Width="145"  VerticalAlignment="Top" Command="{Binding AgvArriveLineOneEmptyRollerLoc}"/>
+                    
+
+
+                        <!--<WrapPanel Orientation="Horizontal">
                             <Button Content="清洗台呼叫AGV" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding CleanPlateCallAgv}"/>
                         </WrapPanel>
-                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <Button Content="线体1到炒锅1" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvDebug}"/>
-                    <Button Content="线体1到炒锅4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click"/>
-                    <Button Content="线体2到炒锅2" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_1"/>
-                    <Button Content="线体2到炒锅5" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_2"/>
-                    <Button Content="线体3到炒锅3" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_3"/>
-                    <Button Content="炒锅1到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_4"/>
-                    <Button Content="炒锅2到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_5"/>
-                    <Button Content="炒锅3到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_6"/>
-                    <Button Content="炒锅4到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_7"/>
-                    <Button Content="炒锅5到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_8"/>
-                    <Button Content="线体1到清洗" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_9"/>
-                    <Button Content="线体2到清洗" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_10"/>
-                    <Button Content="线体3到清洗" Style="{StaticResource buttonStyle}" VerticalAlignment="Top"  Click="Button_Click_11"/>
-                    <Button Content="清洗到线体4" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Click="Button_Click_12"/>
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+
                 </WrapPanel>
-                   
-              
+
+
             </GroupBox>
-                <GroupBox Grid.Column="2" Header="AGV信号" Foreground="Aqua">
-               
-                    <WrapPanel Orientation="Horizontal">
-                        <Button Content="AGV线体1上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLOneArrive}"/>
+            <GroupBox Grid.Column="2" Header="2号滚筒线" Foreground="Aqua">
+
+                <WrapPanel Orientation="Horizontal">
+                    <Button Margin="3,3" Content="线体2任务重置"  VerticalAlignment="Top" Command="{Binding LineTwoTaskExit}"></Button>
+                    <Button Content="空桶清洗任务重置" Width="140" Margin="3,3" VerticalAlignment="Top" Command="{Binding LineTwoEmptyRollerCleanTaskRestart}"/>
+                    <Button Content="线体2出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_35" Width="145"/>
+                    <Button Content="线体2出桶复位" Width="140" Click="Button_Click_16" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV线体2上料就位" Margin="3,3" Width="120" Command="{Binding AGVLTwoArrive}"/>
+                    <Button Content="AGV线体2空桶上料就位"  Margin="3,3" Width="145"  VerticalAlignment="Top" Command="{Binding AgvArriveLineTwoEmptyRollerLoc}"/>
+                    <!--
                     <Button Content="AGV线体1上料完成" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLineOneLoadCom}"/>
                     <Button Content="AGV炒锅下料就位" Style="{StaticResource buttonStyle}" RenderTransformOrigin="0.5,0.5" Width="114" Command="{Binding AGVFryPotDownArrive}">
                         </Button>
@@ -86,33 +99,41 @@
                         <Button Content="AGV空桶清洗上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoadCom}"/>
                         <Button Content="AGV线体4空桶下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLoc}"/>
                         <Button Content="AGV线体4空桶下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLocCom}"/>
-                    </WrapPanel>
+                    </WrapPanel>-->
                 </WrapPanel>
-               
-                
+
+
             </GroupBox>
-            </UniformGrid>
+        </UniformGrid>
         <UniformGrid Columns="2" Grid.Row="1">
-            <GroupBox Grid.Column="1" Header="PLC信号" Foreground="Aqua" BorderBrush="Pink">
+            <GroupBox Grid.Column="1" Header="3号滚筒线" Foreground="Aqua" BorderBrush="Pink">
                 <WrapPanel Orientation="Horizontal">
-                    <Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineTwoRunning}"></Button>
+
+                    <!--<Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineTwoRunning}"></Button>
+                    -->
                     <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--
                     <ComboBox SelectionChanged="ComboBox_SelectionChanged_1" ItemsSource="{Binding LineTwoRollerCode}" Background="Transparent" Width="100" Height="34" Margin="3,3"/>
                     <Button Content="炒锅进料就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotTwoInputArrive}"/>
                     <Button Content="炒锅空桶就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotTwoEmptyRollerArrive}"/>
                     <Button Content="配方完成信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineTwoRecipeComSignal}"/>
-                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <Button Content="线体2任务重置" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineTwoTaskExit}"></Button>
-                    <Button Content="空桶清洗任务重置" Width="140" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineTwoEmptyRollerCleanTaskRestart}"/>
-                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <WrapPanel Orientation="Horizontal">
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+                    <Button Content="线体3任务重置" Margin="3,3" VerticalAlignment="Top" Command="{Binding LineThreeTaskExit}"></Button>
+                    <Button Content="空桶清洗任务重置" Width="140" Margin="3,3" VerticalAlignment="Top" Command="{Binding LineThreeEmptyRollerCleanTaskRestart}"/>
+                    <Button Content="线体3出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_36" Width="145"/>
+                    <Button Content="线体3出桶复位" Width="140" Click="Button_Click_17" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV线体3上料就位" Margin="3,3"  Width="120" Command="{Binding AGVLThreeArrive}"/>
+                    <Button Content="AGV线体3空桶上料就位" Margin="3,3" Width="145"  VerticalAlignment="Top" Command="{Binding AgvArriveLineThreeEmptyRollerLoc}"/>
+                    <!--<WrapPanel Orientation="Horizontal">
                         <Button Content="清洗台呼叫AGV" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding CleanPlateCallAgv}"/>
-                    </WrapPanel>
+                    </WrapPanel>-->
                 </WrapPanel>
             </GroupBox>
-            <GroupBox Grid.Column="2" Header="AGV信号" Foreground="Aqua">
+            <GroupBox Grid.Column="2" Header="回桶线" Foreground="Aqua">
                 <WrapPanel Orientation="Horizontal">
-                    <Button Content="AGV线体2上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLTwoArrive}"/>
+                    <Button Content="回桶线进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_44" Width="145"/>
+                    <Button Content="回桶线信号复位" Width="140" Click="Button_Click_13" Margin="3,3" VerticalAlignment="Top" />
+                    <!--
                     <Button Content="AGV线体2上料完成" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLineTwoLoadCom}"/>
                     <Button Content="AGV炒锅下料就位" Style="{StaticResource buttonStyle}" RenderTransformOrigin="0.5,0.5" Width="114" Command="{Binding AGVFryPotTwoDownArrive}">
                     </Button>
@@ -128,31 +149,159 @@
                         <Button Content="AGV空桶清洗上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoadCom}"/>
                         <Button Content="AGV线体4空桶下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLoc}"/>
                         <Button Content="AGV线体4空桶下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLocCom}"/>
-                    </WrapPanel>
+                    </WrapPanel>-->
                 </WrapPanel>
             </GroupBox>
         </UniformGrid>
         <UniformGrid Columns="2" Grid.Row="2">
-            <GroupBox Grid.Column="1" Header="PLC信号" Foreground="Aqua" BorderBrush="Pink">
+            <GroupBox Grid.Column="1" Header="1号炒锅" Foreground="Aqua" BorderBrush="Pink">
                 <WrapPanel Orientation="Horizontal">
-                    <Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineThreeRunning}"></Button>
+                    <Button Content="炒锅1料桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_38" Width="145"/>
+                    <Button Content="炒锅1进桶复位" Width="140" Click="Button_Click_18" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅1空桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_29" Width="145"/>
+                    <Button Content="炒锅1出桶复位" Width="140" Click="Button_Click_23" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅1配方复位" Width="140" Click="Button_Click_45" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV炒锅1下料就位"  RenderTransformOrigin="0.5,0.5" Margin="3,3" Width="145" Command="{Binding AGVFryPotDownArrive}"/>
+                    <Button Content="AGV炒锅1空桶上料就位" Margin="3,3" Width="145" Command="{Binding AGVFryPotUpArrive}"/>
+                    <!--<Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineThreeRunning}"></Button>
+                    -->
                     <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--
                     <ComboBox SelectionChanged="ComboBox_SelectionChanged_2" ItemsSource="{Binding LineThreeRollerCode}" Background="Transparent" Width="100" Height="34" Margin="3,3"/>
                     <Button Content="炒锅进料就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeInputArrive}"/>
                     <Button Content="炒锅空桶就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeEmptyRollerArrive}"/>
                     <Button Content="配方完成信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineThreeRecipeComSignal}"/>
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+
+
+                    <!--<Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
+                    <WrapPanel Orientation="Horizontal">
+                        <Button Content="清洗台呼叫AGV" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding CleanPlateCallAgv}"/>
+                    </WrapPanel>-->
+                </WrapPanel>
+            </GroupBox>
+            <GroupBox Grid.Column="2" Header="2号炒锅" Foreground="Aqua">
+                <WrapPanel Orientation="Horizontal">
+                    <Button Content="炒锅2料桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_39" Width="145"/>
+                    <Button Content="炒锅2进桶复位" Width="140" Click="Button_Click_19" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅2空桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_30" Width="145"/>
+                    <Button Content="炒锅2出桶复位" Width="140" Click="Button_Click_24" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅2配方复位" Width="140" Click="Button_Click_46" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV炒锅2下料就位" Margin="3,3" RenderTransformOrigin="0.5,0.5" Width="145" Command="{Binding AGVFryPotTwoDownArrive}"/>
+                    <Button Content="AGV炒锅2空桶上料就位" Margin="3,3" Width="145" Command="{Binding AGVFryPotTwoUpArrive}"/>
+                    <!--<Button Content="AGV线体3上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLThreeArrive}"/>
+                    <Button Content="AGV线体3上料完成" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLineThreeLoadCom}"/>
+                    <Button Content="AGV炒锅下料就位" Style="{StaticResource buttonStyle}" RenderTransformOrigin="0.5,0.5" Width="114" Command="{Binding AGVFryPotThreeDownArrive}">
+                    </Button>
+                    <Button Content="AGV炒锅空桶上料就位" Style="{StaticResource buttonStyle}" Width="139" Command="{Binding AGVFryPotThreeUpArrive}"/>
+                    <Button Content="AGV拿到空桶信号" Style="{StaticResource buttonStyle}" Width="114" Command="{Binding AGVFryPotThreeGetEmptyRoller}"/>
                     <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
-                    <Button Content="线体3任务重置" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineThreeTaskExit}"></Button>
-                    <Button Content="空桶清洗任务重置" Width="140" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineThreeEmptyRollerCleanTaskRestart}"/>
+                    <WrapPanel Orientation="Horizontal">
+                        <Button Content="AGV线体3空桶上料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineThreeEmptyRollerLoc}"/>
+                        <Button Content="AGV线体3空桶上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvLineThreeLoadEmptyCom}"/>
+                        <Button Content="AGV空桶清洗下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLoc}"/>
+                        <Button Content="AGV空桶清洗下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocCom}"/>
+                        <Button Content="AGV空桶清洗上料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoad}"/>
+                        <Button Content="AGV空桶清洗上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoadCom}"/>
+                        <Button Content="AGV线体4空桶下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLoc}"/>
+                        <Button Content="AGV线体4空桶下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLocCom}"/>
+                    </WrapPanel>-->
+                </WrapPanel>
+            </GroupBox>
+        </UniformGrid>
+        <UniformGrid Columns="2" Grid.Row="3">
+            <GroupBox Grid.Column="1" Header="3号炒锅" Foreground="Aqua" BorderBrush="Pink">
+                <WrapPanel Orientation="Horizontal">
+                    <Button Content="炒锅3料桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_40" Width="145"/>
+                    <Button Content="炒锅3进桶复位" Width="140" Click="Button_Click_20" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅3空桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_31" Width="145"/>
+                    <Button Content="炒锅3出桶复位" Width="140" Click="Button_Click_25" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅3配方复位" Width="140" Click="Button_Click_47" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV炒锅3下料就位"  RenderTransformOrigin="0.5,0.5" Margin="3,3" Width="145" Command="{Binding AGVFryPotThreeDownArrive}"/>
+                    <Button Content="AGV炒锅3空桶上料就位" Margin="3,3"  Width="145" Command="{Binding AGVFryPotThreeUpArrive}"/>
+                    <!--<Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineThreeRunning}"></Button>
+                    -->
+                    <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--
+                    <ComboBox SelectionChanged="ComboBox_SelectionChanged_2" ItemsSource="{Binding LineThreeRollerCode}" Background="Transparent" Width="100" Height="34" Margin="3,3"/>
+                    <Button Content="炒锅进料就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeInputArrive}"/>
+                    <Button Content="炒锅空桶就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeEmptyRollerArrive}"/>
+                    <Button Content="配方完成信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineThreeRecipeComSignal}"/>
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+
+
+                    <!--<Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
+                    <WrapPanel Orientation="Horizontal">
+                        <Button Content="清洗台呼叫AGV" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding CleanPlateCallAgv}"/>
+                    </WrapPanel>-->
+                </WrapPanel>
+            </GroupBox>
+            <GroupBox Grid.Column="2" Header="4号炒锅" Foreground="Aqua">
+                <WrapPanel Orientation="Horizontal">
+                    <Button Content="炒锅4料桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_41" Width="145"/>
+                    <Button Content="炒锅4进桶复位" Width="140" Click="Button_Click_21" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅4空桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_32" Width="145"/>
+                    <Button Content="炒锅4出桶复位" Width="140" Click="Button_Click_26" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅4配方复位" Width="140" Click="Button_Click_48" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV炒锅4下料就位"  RenderTransformOrigin="0.5,0.5" Margin="3,3" Width="145" Command="{Binding AGVFryPotDownArrive}"/>
+                    <Button Content="AGV炒锅4空桶上料就位" Margin="3,3"  Width="145" Command="{Binding AGVFryPotUpArrive}"/>
+                    <!--<Button Content="AGV线体3上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLThreeArrive}"/>
+                    <Button Content="AGV线体3上料完成" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLineThreeLoadCom}"/>
+                    <Button Content="AGV炒锅下料就位" Style="{StaticResource buttonStyle}" RenderTransformOrigin="0.5,0.5" Width="114" Command="{Binding AGVFryPotThreeDownArrive}">
+                    </Button>
+                    <Button Content="AGV炒锅空桶上料就位" Style="{StaticResource buttonStyle}" Width="139" Command="{Binding AGVFryPotThreeUpArrive}"/>
+                    <Button Content="AGV拿到空桶信号" Style="{StaticResource buttonStyle}" Width="114" Command="{Binding AGVFryPotThreeGetEmptyRoller}"/>
                     <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
+                    <WrapPanel Orientation="Horizontal">
+                        <Button Content="AGV线体3空桶上料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineThreeEmptyRollerLoc}"/>
+                        <Button Content="AGV线体3空桶上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvLineThreeLoadEmptyCom}"/>
+                        <Button Content="AGV空桶清洗下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLoc}"/>
+                        <Button Content="AGV空桶清洗下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocCom}"/>
+                        <Button Content="AGV空桶清洗上料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoad}"/>
+                        <Button Content="AGV空桶清洗上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoadCom}"/>
+                        <Button Content="AGV线体4空桶下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLoc}"/>
+                        <Button Content="AGV线体4空桶下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLocCom}"/>
+                    </WrapPanel>-->
+                </WrapPanel>
+            </GroupBox>
+
+        </UniformGrid>
+        <UniformGrid Columns="2" Grid.Row="4">
+            <GroupBox Grid.Column="1" Header="5号炒锅" Foreground="Aqua" BorderBrush="Pink">
+                <WrapPanel Orientation="Horizontal">
+                    <Button Content="炒锅5料桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_42" Width="145"/>
+                    <Button Content="炒锅5进桶复位" Width="140" Click="Button_Click_22" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅5空桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_33" Width="145"/>
+                    <Button Content="炒锅5出桶复位" Width="140" Click="Button_Click_27" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="炒锅5配方复位" Width="140" Click="Button_Click_49" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV炒锅5下料就位"  Margin="3,3" RenderTransformOrigin="0.5,0.5" Width="145" Command="{Binding AGVFryPotTwoDownArrive}"/>
+                    <Button Content="AGV炒锅5空桶上料就位"  Margin="3,3" Width="145" Command="{Binding AGVFryPotTwoUpArrive}"/>
+                    <!--<Button Content="滚筒线运行信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding RollerLineThreeRunning}"></Button>
+                    -->
+                    <!--<Button Content="工位号8桶号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding EightWorkLoc}"></Button>-->
+                    <!--
+                    <ComboBox SelectionChanged="ComboBox_SelectionChanged_2" ItemsSource="{Binding LineThreeRollerCode}" Background="Transparent" Width="100" Height="34" Margin="3,3"/>
+                    <Button Content="炒锅进料就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeInputArrive}"/>
+                    <Button Content="炒锅空桶就位" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding FryPotThreeEmptyRollerArrive}"/>
+                    <Button Content="配方完成信号" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding LineThreeRecipeComSignal}"/>
+                    <Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>-->
+
+
+                    <!--<Line Stroke="Aqua" StrokeThickness="2" X1="0" X2="860" Y1="0" Y2="0"/>
                     <WrapPanel Orientation="Horizontal">
                         <Button Content="清洗台呼叫AGV" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding CleanPlateCallAgv}"/>
-                    </WrapPanel>
+                    </WrapPanel>-->
                 </WrapPanel>
             </GroupBox>
-            <GroupBox Grid.Column="2" Header="AGV信号" Foreground="Aqua">
+            <GroupBox Grid.Column="2" Header="洗桶机" Foreground="Aqua">
                 <WrapPanel Orientation="Horizontal">
-                    <Button Content="AGV线体3上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLThreeArrive}"/>
+
+                    <Button Content="洗桶进桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_43" Width="145"/>
+                    <Button Content="洗桶机进桶信号复位" Width="140" Click="Button_Click_14" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="洗桶出桶信号" Margin="3,3" VerticalAlignment="Center" Click="Button_Click_37" Width="145"/>
+                    <Button Content="洗桶机出桶信号复位" Width="140" Click="Button_Click_28" Margin="3,3" VerticalAlignment="Top" />
+                    <Button Content="AGV空桶清洗上料就位" Margin="3,3" Width="145"  VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoad}"/>
+                    <!--<Button Content="AGV线体3上料就位" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLThreeArrive}"/>
                     <Button Content="AGV线体3上料完成" Style="{StaticResource buttonStyle}" Width="120" Command="{Binding AGVLineThreeLoadCom}"/>
                     <Button Content="AGV炒锅下料就位" Style="{StaticResource buttonStyle}" RenderTransformOrigin="0.5,0.5" Width="114" Command="{Binding AGVFryPotThreeDownArrive}">
                     </Button>
@@ -168,10 +317,31 @@
                         <Button Content="AGV空桶清洗上料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveCleanPlateLocLoadCom}"/>
                         <Button Content="AGV线体4空桶下料就位" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLoc}"/>
                         <Button Content="AGV线体4空桶下料完成" Width="145" Style="{StaticResource buttonStyle}" VerticalAlignment="Top" Command="{Binding AgvArriveLineFourLocCom}"/>
-                    </WrapPanel>
+                    </WrapPanel>-->
                 </WrapPanel>
             </GroupBox>
         </UniformGrid>
+        <GroupBox Grid.Row="5" Header="AGV路径手动调度" Foreground="Aqua">
+            <WrapPanel Orientation="Horizontal">
+                <Button Content="线体1到炒锅1" Margin="5,3" VerticalAlignment="Top" Command="{Binding AgvDebug}"/>
+                <Button Content="线体1到炒锅4" Margin="5,3" VerticalAlignment="Top" Click="Button_Click"/>
+                <Button Content="线体2到炒锅2" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_1"/>
+                <Button Content="线体2到炒锅5" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_2"/>
+                <Button Content="线体3到炒锅3" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_3"/>
+                <Line Stroke="Transparent" StrokeThickness="2" X1="0" X2="1720" Y1="0" Y2="0"/>
+                <Button Content="炒锅1到回桶线" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_4"/>
+                <Button Content="炒锅2到回桶线" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_5"/>
+                <Button Content="炒锅3到回桶线" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_6"/>
+                <Button Content="炒锅4到回桶线" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_7"/>
+                <Button Content="炒锅5到回桶线" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_8"/>
+                <Line Stroke="Transparent" StrokeThickness="2" X1="0" X2="1720" Y1="0" Y2="0"/>
+                <Button Content="线体1到洗桶机" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_9"/>
+                <Button Content="线体2到洗桶机" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_10"/>
+                <Button Content="线体3到洗桶机" Margin="5,3" VerticalAlignment="Top"  Click="Button_Click_11"/>
+                <Button Content="洗桶机到回桶线" Margin="5,3" VerticalAlignment="Top" Click="Button_Click_12"/>
+
+            </WrapPanel>
+        </GroupBox>
     </Grid>
 
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/FryPot_DosingSystem/View/DebugView.xaml.cs b/FryPot_DosingSystem/View/DebugView.xaml.cs
index b58cb33a..6c92addd 100644
--- a/FryPot_DosingSystem/View/DebugView.xaml.cs
+++ b/FryPot_DosingSystem/View/DebugView.xaml.cs
@@ -1,10 +1,12 @@
 using BPASmartClient.AGV;
 using BPASmartClient.Helper;
 using FryPot_DosingSystem.Control;
+using FryPot_DosingSystem.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -127,7 +129,343 @@ namespace FryPot_DosingSystem.View
             AGVHelper.GetInstance.AgvFromCleanToLineFourUnLoadRoller(Guid.NewGuid().ToString("D"));
 
         }
-
-       
+        /// <summary>
+        /// 回桶线信号复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_13(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1067",0);
+        }
+        /// <summary>
+        /// 空桶洗桶信号复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_14(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1065", 0);
+        }
+        /// <summary>
+        /// 线体1AGV进料复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_15(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1052", 0);
+        }
+        /// <summary>
+        /// 线体2AGV进料复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_16(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1053", 0);
+        }
+        /// <summary>
+        /// 线体3AGV进料复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_17(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1054", 0);
+        }
+        /// <summary>
+        /// 炒锅1进桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_18(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1055", 0);
+        }
+        /// <summary>
+        /// 炒锅2进桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_19(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1056", 0);
+        }
+        /// <summary>
+        /// 炒锅3进桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_20(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1057", 0);
+        }
+        /// <summary>
+        /// 炒锅4进桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_21(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1058", 0);
+        }
+        /// <summary>
+        /// 炒锅5进桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_22(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1059", 0);
+        }
+        /// <summary>
+        /// 炒锅1出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_23(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1060", 0);
+        }
+        /// <summary>
+        /// 炒锅2出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_24(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1061", 0);
+        }
+        /// <summary>
+        /// 炒锅3出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_25(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1062", 0);
+        }
+        /// <summary>
+        /// 炒锅4出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_26(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1063", 0);
+        }
+        /// <summary>
+        /// 炒锅5出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_27(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1064", 0);
+        }
+        /// <summary>
+        /// 洗桶机出桶复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_28(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1066", 0);
+        }
+        /// <summary>
+        /// 炒锅1空桶AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_29(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1060", 1);
+        }
+        /// <summary>
+        /// 炒锅2空桶AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_30(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1061", 1);
+        }
+        /// <summary>
+        /// 炒锅3空桶AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_31(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1062", 1);
+        }
+        /// <summary>
+        /// 炒锅4空桶AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_32(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1063", 1);
+        }
+        /// <summary>
+        /// 炒锅5空桶AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_33(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1064", 1);
+        }
+        /// <summary>
+        /// 线体1AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_34(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1052", 1);
+        }
+        /// <summary>
+        /// 线体2AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_35(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1053", 1);
+        }
+        /// <summary>
+        /// 线体3AGV到位信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_36(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1054", 1);
+        }
+        /// <summary>
+        /// 洗桶机出桶g
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_37(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1066", 1);
+        }
+        /// <summary>
+        /// 炒锅1进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_38(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1055", 1);
+        }
+        /// <summary>
+        /// 炒锅2进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_39(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1056", 1);
+        }
+        /// <summary>
+        /// 炒锅3进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_40(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1057", 1);
+        }
+        /// <summary>
+        /// 炒锅4进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_41(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1058", 1);
+        }
+        /// <summary>
+        /// 炒锅5进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_42(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1059", 1);
+        }
+        /// <summary>
+        /// 洗桶机进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_43(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1065", 1);
+        }
+        /// <summary>
+        /// 回桶线进桶信号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_44(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePlcData("D1067", 1);
+        }
+        /// <summary>
+        /// 炒锅1配方复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_45(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePotOnePlcData("D2999",1);
+            Task.Run(new Action(() => { Thread.Sleep(2000); DeviceOperate.GetInstance.WritePotOnePlcData("D2999", 0); }));
+        }
+        /// <summary>
+        /// 炒锅2配方复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_46(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePotTwoPlcData("D2999", 1);
+            Task.Run(new Action(() => { Thread.Sleep(2000); DeviceOperate.GetInstance.WritePotTwoPlcData("D2999", 0); }));
+        }
+        /// <summary>
+        /// 炒锅3配方复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_47(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePotThreePlcData("D2999", 1);
+            Task.Run(new Action(() => { Thread.Sleep(2000); DeviceOperate.GetInstance.WritePotThreePlcData("D2999", 0); }));
+        }
+        /// <summary>
+        /// 炒锅4配方复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_48(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePotFourPlcData("D2999", 1);
+            Task.Run(new Action(() => { Thread.Sleep(2000); DeviceOperate.GetInstance.WritePotFourPlcData("D2999", 0); }));
+        }
+        /// <summary>
+        /// 炒锅5配方复位
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Button_Click_49(object sender, RoutedEventArgs e)
+        {
+            DeviceOperate.GetInstance.WritePotFivePlcData("D2999", 1);
+            Task.Run(new Action(() => { Thread.Sleep(2000); DeviceOperate.GetInstance.WritePotFivePlcData("D2999", 0); }));
+        }
     }
 }
diff --git a/FryPot_DosingSystem/View/FlowProcessView.xaml b/FryPot_DosingSystem/View/FlowProcessView.xaml
index dd2cad78..2e2dc380 100644
--- a/FryPot_DosingSystem/View/FlowProcessView.xaml
+++ b/FryPot_DosingSystem/View/FlowProcessView.xaml
@@ -7,7 +7,7 @@
         xmlns:vm="clr-namespace:FryPot_DosingSystem.ViewModel"
          xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
         mc:Ignorable="d"
-        Title="FlowProcessView" Height="650" Width="940" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True">
+        Title="FlowProcessView" Height="675" Width="1075" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True">
     <Window.DataContext>
         <vm:FlowProcessSetViewModel/>
     </Window.DataContext>
@@ -389,6 +389,7 @@
         </Border.Background>
         <Grid>
             <Grid.RowDefinitions>
+                <RowDefinition Height="50"/>
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="40"/>
@@ -407,12 +408,13 @@
                 <Button Content="取消" Height="30" Width="100" Margin="0,0,10,0"  Background="Transparent" FontSize="18" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Command="{Binding CloseWindowCommand}"></Button>
 
             </StackPanel>
-            <Grid Grid.Row="2" Background="#FF2AB2E7" Margin="0,0,0,8">
+            <Grid Grid.Row="2" Background="#FF2AB2E7" Margin="0,0,0,5">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="87"/>
                     <ColumnDefinition Width="120"/>
                     <ColumnDefinition Width="92"/>
-                    <ColumnDefinition Width="92"/>
+                    <ColumnDefinition Width="112"/>
+                    <ColumnDefinition Width="112"/>
                     <ColumnDefinition Width="92"/>
                     <ColumnDefinition Width="92"/>
                     <ColumnDefinition Width="92"/>
@@ -425,23 +427,30 @@
                 <GridSplitter BorderThickness="0.2" BorderBrush="White"></GridSplitter>
                 <TextBlock Grid.Column="1" Text="原料/桶号设定" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="1" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="2" Text="速度设定" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="2" Text="速度(Hz)" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="2" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="3" Text="重量设定" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18" ></TextBlock>
+                <TextBlock Grid.Column="3" Text="添加重量(Kg)" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18" ></TextBlock>
                 <GridSplitter Grid.Column="3" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="4" Text="温度设定" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="4" Text="目标重量(Kg)" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18" ></TextBlock>
                 <GridSplitter Grid.Column="4" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="5" Text="时间设定" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="5" Text="温度(℃)" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="5" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="6" Text="小火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="6" Text="时间(M)" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="6" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="7" Text="中火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="7" Text="小火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="7" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="8" Text="大火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="8" Text="中火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
                 <GridSplitter Grid.Column="8" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
-                <TextBlock Grid.Column="9" Text="强火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <TextBlock Grid.Column="9" Text="大火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
+                <GridSplitter Grid.Column="9" BorderThickness="0.2" BorderBrush="White"></GridSplitter>
+                <TextBlock Grid.Column="10" Text="强火比例" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="white" FontSize="18"/>
             </Grid>
-            <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Hidden">
+            <StackPanel Grid.Row="3" VerticalAlignment="Center" Orientation="Horizontal" Margin="0,0,0,5">
+                <TextBlock Text="目标重量偏差设置：" FontSize="20" Foreground="#FF2AB2E7" VerticalAlignment="Center"/>
+                <TextBox Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#e69519" Cursor="Hand" Text="{Binding targetWeightOffset}" FontSize="18" Width="200" TextChanged="TextBox_TextChanged_10" Height="35" VerticalContentAlignment="Center"/>
+                <TextBlock Text="Kg" FontSize="20" Foreground="#FF2AB2E7" VerticalAlignment="Center"/>
+            </StackPanel>
+            <ScrollViewer Grid.Row="4" VerticalScrollBarVisibility="Hidden">
                 <ItemsControl x:Name="itemcontrols" AlternationCount="{Binding flowProcessModels.Count}"  ItemsSource="{Binding flowProcessModels}"  Margin="0,1,0,-1">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
@@ -455,7 +464,8 @@
 RelativeSource TemplatedParent}}" Foreground="SkyBlue" Width="87" Height="40"  VerticalContentAlignment="Center" HorizontalContentAlignment="Center" FontSize="18" Background="Transparent" BorderBrush="#FF2AB2E7" BorderThickness="1,1,0.5,1"/>
                                 <ComboBox ItemsSource="{Binding DataContext.FlowItems, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}" Text="{Binding FryMaterialNum}" Style="{StaticResource BaseComboBoxStyle}" IsReadOnly="True" Width="120" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1"/>
                                 <TextBox Text="{Binding FrySpeed}" Width="92" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1" TextChanged="TextBox_TextChanged"/>
-                                <TextBox Text="{Binding FryWeight}" Width="92" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1" TextChanged="TextBox_TextChanged_1"/>
+                                <TextBox Text="{Binding FryWeight}" Width="112" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1" TextChanged="TextBox_TextChanged_1"/>
+                                <TextBox Text="{Binding TargeWeight}" Width="112" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1" TextChanged="TextBox_TextChanged_8"/>
                                 <TextBox Text="{Binding FryTemperature}" Width="92" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,0.5,1" TextChanged="TextBox_TextChanged_2"/>
                                 <TextBox Text="{Binding FryPeriodTime}" Width="92" Height="40" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" Foreground="SkyBlue" FontSize="18" BorderBrush="#FF2AB2E7" BorderThickness="0.5,1,1,1" TextChanged="TextBox_TextChanged_3"/>
                                
diff --git a/FryPot_DosingSystem/View/FlowProcessView.xaml.cs b/FryPot_DosingSystem/View/FlowProcessView.xaml.cs
index f3c50322..7f0efff8 100644
--- a/FryPot_DosingSystem/View/FlowProcessView.xaml.cs
+++ b/FryPot_DosingSystem/View/FlowProcessView.xaml.cs
@@ -160,6 +160,34 @@ namespace FryPot_DosingSystem.View
             }
         }
 
+        private void TextBox_TextChanged_8(object sender, TextChangedEventArgs e)
+        {
+            if (sender is TextBox txt)
+            {
+                txt.Text = TextLimit(txt.Text);
+            }
+        }
+
+      
+
+        private void TextBox_TextChanged_10(object sender, TextChangedEventArgs e)
+        {
+            if (sender is TextBox txtbox)
+            {
+                if (Regex.IsMatch(txtbox.Text, @"^[0-9]+(.[1-9]{0,1})?$"))//验证整数或1位小数
+                {
+                    txtbox.Text = txtbox.Text.Trim();
+
+                }
+                else
+                {
+                    //  MessageBox.Show("原料重量非法输入", "警告", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
+                    txtbox.Text = string.Empty;
+                }
+
+            }
+        }
+
         //private void ComboBox_KeyUp(object sender, KeyEventArgs e)
         //{
         //    var res = sender as ComboBox;
diff --git a/FryPot_DosingSystem/View/NewRecipeView.xaml.cs b/FryPot_DosingSystem/View/NewRecipeView.xaml.cs
index 66544b0d..ebe53134 100644
--- a/FryPot_DosingSystem/View/NewRecipeView.xaml.cs
+++ b/FryPot_DosingSystem/View/NewRecipeView.xaml.cs
@@ -76,14 +76,18 @@ namespace FryPot_DosingSystem.View
         {
             if (sender is TextBox txt)
             {
-                if (new Regex("^[1-8]$").IsMatch(txt.Text))//全匹配
+                if (txt.Text != null)
                 {
-
-                }
-                else
-                {
-                    txt.Text = string.Empty;
+                    if (new Regex("^[1-8]$").IsMatch(txt.Text))//全匹配
+                    {
+
+                    }
+                    else
+                    {
+                        txt.Text = string.Empty;
+                    }
                 }
+                
             }
         }
 
@@ -160,17 +164,20 @@ namespace FryPot_DosingSystem.View
         {
             if (sender is TextBox txtbox)
             {
-                if (Regex.IsMatch(txtbox.Text, @"^\+?[1-9][0-9]*$"))//非零正整数
-                {
-                    txtbox.Text = txtbox.Text.Trim();
-
-                }
-                else
+                if (txtbox != null)
                 {
-                    //  MessageBox.Show("原料重量非法输入", "警告", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
-                    txtbox.Text = string.Empty;
+                    if (Regex.IsMatch(txtbox.Text, @"^\+?[0-9][0-9]*$"))//非零正整数
+                    {
+                        txtbox.Text = txtbox.Text.Trim();
+
+                    }
+                    else
+                    {
+                        //  MessageBox.Show("原料重量非法输入", "警告", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
+                        txtbox.Text = string.Empty;
+                    }
                 }
-
+               
             }
         }
 
@@ -178,17 +185,20 @@ namespace FryPot_DosingSystem.View
         {
             if (sender is TextBox txtbox)
             {
-                if (Regex.IsMatch(txtbox.Text, @"^[0-9]+(.[1-9]{0,1})?$"))//验证整数或1位小数
+                if (txtbox.Text != null)
                 {
-                    txtbox.Text = txtbox.Text.Trim();
-
+                    if (Regex.IsMatch(txtbox.Text, @"^[0-9]+(.[1-9]{0,1})?$"))//验证整数或1位小数
+                    {
+                        txtbox.Text = txtbox.Text.Trim();
+
+                    }
+                    else
+                    {
+                        //  MessageBox.Show("原料重量非法输入", "警告", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
+                        txtbox.Text = string.Empty;
+                    }
                 }
-                else
-                {
-                    //  MessageBox.Show("原料重量非法输入", "警告", MessageBoxButton.OKCancel, MessageBoxImage.Warning);
-                    txtbox.Text = string.Empty;
-                }
-
+              
             }
         }
     }
diff --git a/FryPot_DosingSystem/View/RecipeSendDownView.xaml b/FryPot_DosingSystem/View/RecipeSendDownView.xaml
index 5b6824e3..540a3cd0 100644
--- a/FryPot_DosingSystem/View/RecipeSendDownView.xaml
+++ b/FryPot_DosingSystem/View/RecipeSendDownView.xaml
@@ -26,7 +26,7 @@
             <RowDefinition Height="50"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="配方一键下发" Width="110" Height="30"  Margin="0,0,10,0" Cursor="Hand" Command="{Binding AllRecipeSetDownCommand}"></Button>
+        <!--<Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="配方一键下发" Width="110" Height="30"  Margin="0,0,10,0" Cursor="Hand" Command="{Binding AllRecipeSetDownCommand}"></Button>-->
         <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
             <ItemsControl  ItemsSource="{Binding Recipes}">
                 <ItemsControl.ItemsPanel>
diff --git a/FryPot_DosingSystem/View/RecipesSendDown.xaml b/FryPot_DosingSystem/View/RecipesSendDown.xaml
index 73b465c5..235a6b8f 100644
--- a/FryPot_DosingSystem/View/RecipesSendDown.xaml
+++ b/FryPot_DosingSystem/View/RecipesSendDown.xaml
@@ -49,7 +49,7 @@
             <RowDefinition Height="50"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="配方一键下发" Width="110" Height="30"  Margin="0,0,10,0" Cursor="Hand" Command="{Binding AllRecipeSetDownCommand}"></Button>
+        <!--<Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="配方一键下发" Width="110" Height="30"  Margin="0,0,10,0" Cursor="Hand" Command="{Binding AllRecipeSetDownCommand}"></Button>-->
         <ScrollViewer Name="sv" Grid.Row="1" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"  VerticalScrollBarVisibility="Hidden" >
             <ListView
                 VerticalAlignment="Top"
diff --git a/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs b/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs
index dfa46a3d..6fece1b0 100644
--- a/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs
+++ b/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs
@@ -3,6 +3,7 @@ using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using FryPot_DosingSystem.Model;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -14,13 +15,17 @@ using System.Windows;
 
 namespace FryPot_DosingSystem.ViewModel
 {
-    internal class FlowProcessSetViewModel
+    internal class FlowProcessSetViewModel:ObservableObject
     {
 
         public int Id { get; set; } = 0;
         public static int materialNum { get; set; }
         public ObservableCollection<FlowProcessModel> flowProcessModels { get; set; } = new ObservableCollection<FlowProcessModel>();
-
+        /// <summary>
+        /// 目标重量偏差
+        /// </summary>
+        public string targetWeightOffset { get { return _targetWeightOffset; } set { _targetWeightOffset = value;OnPropertyChanged(); } }
+        private string _targetWeightOffset="0";
         public string currentRecipeName { get; set; }
         public static int currentItemId { get; set; }
         public RelayCommand CloseWindowCommand { get; set; }
@@ -66,6 +71,7 @@ namespace FryPot_DosingSystem.ViewModel
                     var res = Json<RecipeManage>.Data.Recipes.FirstOrDefault(p => p.FlowProcess?.RecipeName == recipeName?.ToString());
                     if (res != null && res is NewRecipeModel recipe) //编辑已有工艺
                     {
+                        targetWeightOffset = recipe.FlowProcess.targetWeightOffset.ToString();
                         foreach (var item in recipe.materialCollection)
                         {
                             if (!FlowItems.Contains(item.MaterialLoc.ToString()))
@@ -73,7 +79,7 @@ namespace FryPot_DosingSystem.ViewModel
                         }
                         foreach (var item in recipe.FlowProcess.fpModels)
                         {
-                            flowProcessModels.Add(new FlowProcessModel { FryMaterialNum = item.FryMaterialNum, FrySpeed = item.FrySpeed, FryWeight = item.FryWeight, FryTemperature = item.FryTemperature, FryPeriodTime = item.FryPeriodTime, SmallFirePercent = item.SmallFirePercent, MidFirePercent = item.MidFirePercent, BigFirePercent = item.BigFirePercent, StrongFirePercent = item.StrongFirePercent });
+                            flowProcessModels.Add(new FlowProcessModel { FryMaterialNum = item.FryMaterialNum, FrySpeed = item.FrySpeed, FryWeight = item.FryWeight, TargeWeight=item.TargeWeight, FryTemperature = item.FryTemperature, FryPeriodTime = item.FryPeriodTime, SmallFirePercent = item.SmallFirePercent, MidFirePercent = item.MidFirePercent, BigFirePercent = item.BigFirePercent, StrongFirePercent = item.StrongFirePercent });
                         }
 
                         // ActionManage.GetInstance.Send("MaterialNum", recipe.materialCollection.Count);
@@ -92,7 +98,7 @@ namespace FryPot_DosingSystem.ViewModel
                                     FlowItems.Add(item.MaterialLoc.ToString());//下拉框
                             }
                             ActionManage.GetInstance.Send("MaterialNum", name.materialCollection.Count);
-                            name.FlowProcess.fpModels = flowProcessModels;
+                            //name.FlowProcess.fpModels = flowProcessModels;
                         }
 
                     }
@@ -110,6 +116,17 @@ namespace FryPot_DosingSystem.ViewModel
                 if (name != null)
                 {
                     name.FlowProcess.RecipeName = currentRecipeName.ToString();
+                    
+                    if (float.TryParse(targetWeightOffset.Trim(), out float offset))
+                    {
+                        name.FlowProcess.targetWeightOffset = offset;//目标重量偏差
+                    }
+                    else
+                    {
+                        MessageBox.Show("非法目标重量偏差设置", "提示", MessageBoxButton.OK, MessageBoxImage.Error);
+                        name.FlowProcess.targetWeightOffset = 0.0F;
+                        return;
+                    }
                     //工艺桶号重复性检测
                     foreach (var item in name.materialCollection)
                     {
@@ -122,11 +139,21 @@ namespace FryPot_DosingSystem.ViewModel
                             return;
                         }
                     }
+                    //工艺步骤中清洗工艺重复性检测
+                    if (flowProcessModels.FirstOrDefault(p=>p.FryMaterialNum=="清洗")!=null)
+                    {
+                        if (flowProcessModels.Where(p => p.FryMaterialNum == "清洗").Count() > 1||flowProcessModels.IndexOf(flowProcessModels.FirstOrDefault(p => p.FryMaterialNum == "清洗"))<flowProcessModels.Count-1)
+                        {
+                            MessageNotify.GetInstance.ShowUserLog("保存失败，清洗工艺重复或非法配置");
+                            MessageBox.Show("保存失败，清洗工艺重复或非法配置", "提示", MessageBoxButton.OK, MessageBoxImage.Error);
+                            return;
+                        } 
+                    }
                     // name.FlowProcess.fpModels = flowProcessModels;
                     name.FlowProcess.fpModels.Clear();
                     foreach (var item in flowProcessModels)
                     {
-                        name.FlowProcess.fpModels.Add(new FlowProcessModel { FryMaterialNum = item.FryMaterialNum, FrySpeed = item.FrySpeed, FryWeight = item.FryWeight, FryTemperature = item.FryTemperature, FryPeriodTime = item.FryPeriodTime, SmallFirePercent = item.SmallFirePercent, MidFirePercent = item.MidFirePercent, BigFirePercent = item.BigFirePercent, StrongFirePercent = item.StrongFirePercent });
+                        name.FlowProcess.fpModels.Add(new FlowProcessModel { FryMaterialNum = item.FryMaterialNum, FrySpeed = item.FrySpeed, FryWeight = item.FryWeight,TargeWeight=item.TargeWeight, FryTemperature = item.FryTemperature, FryPeriodTime = item.FryPeriodTime, SmallFirePercent = item.SmallFirePercent, MidFirePercent = item.MidFirePercent, BigFirePercent = item.BigFirePercent, StrongFirePercent = item.StrongFirePercent });
                     }
 
                     //foreach (var item in name.materialCollection)
diff --git a/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs b/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs
index 99d713b1..e49d4d8b 100644
--- a/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs
+++ b/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs
@@ -43,7 +43,7 @@ namespace FryPot_DosingSystem.ViewModel
         public RelayCommand SaveAs { get; set; }
         public NewRecipeViewModel()
         {
-            Json<RecipeManage>.Read();
+           
             Json<MaterialNames>.Read();
             MaterialNames.GetInstance.Names = Json<MaterialNames>.Data.Names;
             materialNames = Json<MaterialNames>.Data.Names;
@@ -51,6 +51,7 @@ namespace FryPot_DosingSystem.ViewModel
             {
                 if (Id != null && Id is string strId)
                 {
+                    
                     var res = Json<RecipeManage>.Data.Recipes.FirstOrDefault(p => p.RecipeId == strId);
                     if (res != null && res is NewRecipeModel rom)
                     {
@@ -102,24 +103,25 @@ namespace FryPot_DosingSystem.ViewModel
                         
                         if (materials.Count<=8&& materials.Count> 0)
                         {
-                           //int lineNum= materials.ElementAt(0).MaterialLoc / 100;
-                           // //桶号正确性验证
-                           // for (int i = 0; i < materials.Count; i++)
-                           // {
-                           //     if (materials.ElementAt(i).MaterialLoc / 100 != lineNum|| materials.ElementAt(i).MaterialLoc % 100!=i+1||lineNum<=0||lineNum>5)
-                           //     {
-                           //         MessageNotify.GetInstance.ShowUserLog($"新建配方【{RecipeName}】无效：【配方中原料桶号异常】");
-                           //         NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"新建配方【{RecipeName}】无效");
-                           //         ActionManage.GetInstance.Send("CloseNewRecipeView");
-                           //         return;
-                           //     }
-                           // }
+                            int lineNum = materials.ElementAt(0).MaterialLoc / 100;
+                            //桶号正确性验证
+                            for (int i = 0; i < materials.Count; i++)
+                            {
+                                if (materials.ElementAt(i).MaterialLoc / 100 != lineNum || materials.ElementAt(i).MaterialLoc % 100 != i + 1 || lineNum <= 0 || lineNum > 5)
+                                {
+                                    MessageNotify.GetInstance.ShowUserLog($"新建配方【{RecipeName}】无效：【配方中原料桶号异常】");
+                                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Warn, App.MainWindow, "提示", $"新建配方【{RecipeName}】无效");
+                                    ActionManage.GetInstance.Send("CloseNewRecipeView");
+                                    return;
+                                }
+                            }
 
                         prop: string recipeID = Guid.NewGuid().ToString();//配方唯一ID，后期根据实际要求更改
                             var res = Json<RecipeManage>.Data.Recipes.FirstOrDefault(p => p.RecipeId == recipeID);
                             if (res == null)
                             {
                                 Json<RecipeManage>.Data.Recipes.Add(new NewRecipeModel { RecipeId = recipeID, RecipeName = RecipeName, FlowProcess=new FlowProcessManage(), materialCollection = materials,DataTime=DateTime.Now.ToShortDateString()});//配方添加
+                              
                             }
                             else
                             {
@@ -145,21 +147,23 @@ namespace FryPot_DosingSystem.ViewModel
                 {
                     if (materials.Count > 0 && materials.Count <= 8)
                     {
-                        //int lineNum = materials.ElementAt(0).MaterialLoc / 100;
-                        ////桶号正确性验证
-                        //for (int i = 0; i < materials.Count; i++)
-                        //{
-                        //    if (materials.ElementAt(i).MaterialLoc / 100 != lineNum || materials.ElementAt(i).MaterialLoc % 100 != i + 1 || lineNum <= 0 || lineNum > 5)
-                        //    {
-                        //        MessageNotify.GetInstance.ShowUserLog($"另存配方【{RecipeName}】无效：【配方中原料桶号异常】");
-                        //        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"另存配方【{RecipeName}】无效");
-                        //        ActionManage.GetInstance.Send("CloseNewRecipeView");
-                        //        return;
-                        //    }
-                        //}
+                        int lineNum = materials.ElementAt(0).MaterialLoc / 100;
+                        //桶号正确性验证
+                        for (int i = 0; i < materials.Count; i++)
+                        {
+                            if (materials.ElementAt(i).MaterialLoc / 100 != lineNum || materials.ElementAt(i).MaterialLoc % 100 != i + 1 || lineNum <= 0 || lineNum > 5)
+                            {
+                                MessageNotify.GetInstance.ShowUserLog($"另存配方【{RecipeName}】无效：【配方中原料桶号异常】");
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"另存配方【{RecipeName}】无效");
+                                ActionManage.GetInstance.Send("CloseNewRecipeView");
+                                return;
+                            }
+                        }
                         bom.materialCollection = materials;
                         bom.RecipeName = RecipeName;
                         bom.UpdateTime = DateTime.Now.ToShortDateString();
+                        if (bom.FlowProcess != null)
+                            bom.FlowProcess.RecipeName = RecipeName;
                         Json<RecipeManage>.Save();
                         MessageNotify.GetInstance.ShowUserLog($"配方【{RecipeName}】修改成功");
                         NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"修改配方【{RecipeName}】成功");
@@ -181,24 +185,25 @@ namespace FryPot_DosingSystem.ViewModel
                 {
                     if (materials.Count>0&& materials.Count<=8)//验证配方中原料桶数
                     {
-                        //int lineNum = materials.ElementAt(0).MaterialLoc / 100;
-                        ////桶号正确性验证
-                        //for (int i = 0; i < materials.Count; i++)
-                        //{
-                        //    if (materials.ElementAt(i).MaterialLoc / 100 != lineNum || materials.ElementAt(i).MaterialLoc % 100 != i + 1 || lineNum <= 0 || lineNum > 5)
-                        //    {
-                        //        MessageNotify.GetInstance.ShowUserLog($"另存配方【{RecipeName}】无效：【配方中原料桶号异常】");
-                        //        NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"另存配方【{RecipeName}】无效");
-                        //        ActionManage.GetInstance.Send("CloseNewRecipeView");
-                        //        return;
-                        //    }
-                        //}
+                        int lineNum = materials.ElementAt(0).MaterialLoc / 100;
+                        //桶号正确性验证
+                        for (int i = 0; i < materials.Count; i++)
+                        {
+                            if (materials.ElementAt(i).MaterialLoc / 100 != lineNum || materials.ElementAt(i).MaterialLoc % 100 != i + 1 || lineNum <= 0 || lineNum > 5)
+                            {
+                                MessageNotify.GetInstance.ShowUserLog($"另存配方【{RecipeName}】无效：【配方中原料桶号异常】");
+                                NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "提示", $"另存配方【{RecipeName}】无效");
+                                ActionManage.GetInstance.Send("CloseNewRecipeView");
+                                return;
+                            }
+                        }
 
                     prop: string recipeID = Guid.NewGuid().ToString();//配方唯一ID，后期根据实际要求更改
                         var res = Json<RecipeManage>.Data.Recipes.FirstOrDefault(p => p.RecipeId == recipeID);
                         if (res == null)
                         {
-                            Json<RecipeManage>.Data.Recipes.Add(new NewRecipeModel { RecipeId = recipeID, RecipeName = RecipeName, materialCollection = materials });//配方添加
+                            Json<RecipeManage>.Data.Recipes.Add(new NewRecipeModel { RecipeId = recipeID, DataTime = DateTime.Now.ToShortDateString(), RecipeName = RecipeName, materialCollection = materials,FlowProcess=new FlowProcessManage()});//配方添加
+                            //Json<RecipeManage>.Save();
                         }
                         else
                         {
diff --git a/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs b/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs
index 76622ed2..2eed55e7 100644
--- a/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs
+++ b/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs
@@ -30,7 +30,7 @@ namespace FryPot_DosingSystem.ViewModel
         public ObservableCollection<NewRecipeModel> Recipes { get; set; } = new ObservableCollection<NewRecipeModel>();
         public RecipeSetDownViewModel()
         {
-            Json<RecipeManage>.Read();
+            //Json<RecipeManage>.Read();
             Recipes =Json<RecipeManage>.Data.Recipes;
             RecipeSetDownCommand = new RelayCommand<object>((Id) =>
             {
@@ -42,7 +42,7 @@ namespace FryPot_DosingSystem.ViewModel
                         RecipeSetDown(new NewRecipeModel[] { res });
                         //res.RecipeSetInfo = "配方下发成功";
                         //Task.Run(() => { Thread.Sleep(1500); res.RecipeSetInfo = string.Empty; });
-                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!");
+                       
                     }
                     else 
                     {
diff --git a/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs b/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs
index 45846932..cd81630e 100644
--- a/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs
+++ b/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs
@@ -49,7 +49,7 @@ namespace FryPot_DosingSystem.ViewModel
 
         public RecipeSetViewModel()
         {
-            Json<RecipeManage>.Read();
+           // Json<RecipeManage>.Read();
             recipeModels =Json<RecipeManage>.Data.Recipes;
             int count = recipeModels.Count;
             bool sign = false;
@@ -70,6 +70,7 @@ namespace FryPot_DosingSystem.ViewModel
                         else
                         {
                             sign = true;
+                            Json<RecipeManage>.Data.Recipes.RemoveAt(Json<RecipeManage>.Data.Recipes.Count - 1);
                         }
                     } 
                 }
@@ -104,9 +105,10 @@ namespace FryPot_DosingSystem.ViewModel
                     var res = recipeModels.FirstOrDefault(p => p.RecipeId == strId);
                     if (res != null && res is NewRecipeModel nes)
                     {
-                        recipeModels.Remove(res);//删除配方
+                        recipeModels.Remove(nes);//删除配方
                         Json<RecipeManage>.Save();//保存配方
                         count = recipeModels.Count;
+                        MessageNotify.GetInstance.ShowUserLog($"成功删除配方【{nes.RecipeName}】");
                     }
                 }
             });