From 5d543ce35a4b30bf0dd6cb54cb2abe6939a63a82 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 6 Sep 2024 15:44:51 +0800
Subject: [PATCH] =?UTF-8?q?change-=E8=AE=BE=E5=A4=87=E7=9B=91=E5=90=ACbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Business/ProdCompletionBusiness.cs  |  14 +-
 SlnMesnac.WPF/Page/DevMonitorPage.xaml        |   5 +-
 SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs     | 313 +++++++++---------
 SlnMesnac.WPF/Page/SystemAlarmWindow.xaml     |   2 +-
 .../Page/Window/InputDialogWindow.xaml.cs     |   5 +-
 5 files changed, 178 insertions(+), 161 deletions(-)

diff --git a/SlnMesnac.Business/ProdCompletionBusiness.cs b/SlnMesnac.Business/ProdCompletionBusiness.cs
index 5eaace3..a357427 100644
--- a/SlnMesnac.Business/ProdCompletionBusiness.cs
+++ b/SlnMesnac.Business/ProdCompletionBusiness.cs
@@ -78,17 +78,18 @@ namespace SlnMesnac.Business
             _mesProductOrderService = serviceProvider.GetRequiredService<IMesProductOrderService>();
             _baseMaterialInfoService = serviceProvider.GetRequiredService<IBaseMaterialInfoService>();
             Init();
-
+          //  test();
         }
 
         private void test()
         {
             // MesProductPlanDetail? mesProductPlanDetail = sqlSugarClient.AsTenant().GetConnection("mes").Queryable<MesProductPlanDetail>().First(x => x.PlanCode == "20240724144533JL001");
-           // string epc = "A123456";
-           //_mesProductPlanService.GetStartedProdPlan(out MesProductPlanDto productPlanDto);
-           // string bigCode = GenerateBigBarcode(productPlanDto, epc);
-            // BindingBarCode(bigCode, epc);
-
+            sqlSugarClient.AsTenant().BeginTran();
+            string epc = "A123456";
+          _mesProductPlanService.GetStartedProdPlan(out MesProductPlanDto productPlanDto);
+            string bigCode = GenerateBigBarcode(productPlanDto, epc);
+            BindingBarCode(bigCode, epc, productPlanDto);
+            sqlSugarClient.AsTenant().BeginTran();
         }
 
 
@@ -287,7 +288,6 @@ namespace SlnMesnac.Business
                             readRfidAmount++;
                             if (readRfidAmount == 5)
                             {
-
                                 string virtualEpc = NoReadRFIDAlarm();
                                 _logger.LogError("小包出口到位信号触发,读取RFID失败超过5次......");
                                 if (!string.IsNullOrEmpty(virtualEpc))
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
index 050ed63..9140a2d 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml
@@ -22,7 +22,6 @@
                     <TextBlock x:Name="SystemStatusTxt" Text="绯荤粺鍋滄満涓�" FontSize="35" VerticalAlignment="Center" Width="180"  Foreground="White" />
                     <Button  x:Name="StartButton"  Style="{StaticResource  BUTTON_AGREE}" Content="涓�閿惎鍔�"  FontSize="30" Background="LimeGreen" Width="180"  Height="60"  Margin="0 0 20 0" Click="StartButton_Click"/>
                     <Button  x:Name="StopButton"   Style="{StaticResource  BUTTON_AGREE}" Content="涓�閿仠姝�"  FontSize="30" Background="OrangeRed" Width="180" Height="60"  Margin="0,0,20,0" Click="StopButton_Click"/>
-                    <Button  x:Name="StopUrgentButton"  Style="{StaticResource  BUTTON_AGREE}" Content="鎬ュ仠"  FontSize="30" Background="#E4B74C" Width="150" Height="60"  Margin="0,0,0,0" Click="StopUrgentButton_Click"/>
                    
                     <TextBlock Text="缂撳瓨鍖洪噸閲�:" FontSize="25" VerticalAlignment="Center" Width="140"  Foreground="White" HorizontalAlignment="Left" Margin="150 0 10 0" />
                     <TextBlock  x:Name="BufferWeightTxt" Text="0" Width="80" FontSize="25" VerticalAlignment="Center" Margin="0,0,20,0" Foreground="White"/>
@@ -173,7 +172,9 @@
                         <StackPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Orientation="Horizontal" >
                          
                             <Button   x:Name="StartUnPackButton"  Content="鎷嗗寘鏈哄惎鍔�"  FontSize="20" Background="LimeGreen" Width="120"  Height="40"  Margin="0 0 20 0" Click="StartUnPackButton_Click" />
-                            <Button   x:Name="StopUnPackButton" Content="鎷嗗寘鏈哄仠姝�"  FontSize="20" Background="OrangeRed" Width="120" Height="40"  Margin="0,0,0,0" Click="StopUnPackButton_Click"/>
+                            <Button   x:Name="StopUnPackButton" Content="鎷嗗寘鏈哄仠姝�"  FontSize="20" Background="OrangeRed" Width="120" Height="40"  Margin="0,0,20,0" Click="StopUnPackButton_Click"/>
+                            <Button  x:Name="StopUrgentButton"  Style="{StaticResource  BUTTON_AGREE}" Content="鎬ュ仠"  FontSize="20" Background="#E4B74C" Width="120"  Height="40"  Margin="0,0,0,0" Click="StopUrgentButton_Click"/>
+
                         </StackPanel>
                     </Grid>
                 </Grid>
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 6365ead..d861802 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -42,7 +42,7 @@ namespace SlnMesnac.WPF.Page
         // 璁惧鎶ヨ閲囬泦缂撳瓨
         private List<DmsRecordAlarmTime>? WarningList = null;
         // 璁惧鍙傛暟瀹炴椂鐘舵��
-        private List<DmsRealtimeStatus>? realtimeStatusList= null;
+        private List<DmsRealtimeStatus>? realtimeStatusList = null;
 
 
         private ISqlSugarClient? sqlClient = null;
@@ -82,7 +82,7 @@ namespace SlnMesnac.WPF.Page
             StartAdjustRecipe();
         }
 
-      
+
 
         private void Init()
         {
@@ -177,7 +177,7 @@ namespace SlnMesnac.WPF.Page
                             Thread.Sleep(1000 * 30);
                         }
 
-                       
+
                     }
                     catch (Exception ex)
                     {
@@ -197,7 +197,7 @@ namespace SlnMesnac.WPF.Page
             {
                 string Bags_Amount = _configInfoBusiness.GetConfigInfos().FirstOrDefault(x => x.ConfigKey == "鍖呰琚嬩綑閲�").ConfigValue;
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                { 
+                {
                     BagsAmountTxt.Text = Bags_Amount;
                     BufferWeightTxt.Text = recipeManageCache.BufferWeight.ToString("F2");
 
@@ -208,21 +208,21 @@ namespace SlnMesnac.WPF.Page
                 double Cache_MinWeight = recipeManageCache.MinBufferWeight;
                 double Cache_Weight = recipeManageCache.BufferWeight;
                 bool unPackStatus = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈虹郴缁熻繍琛岀姸鎬�"));
-                if (unPackStatus && (Cache_MaxWeight <= Cache_Weight))
+                if (recipeManageCache.SystemStatus == "1" && unPackStatus && (Cache_MaxWeight <= Cache_Weight))
                 {
                     // 鍋滄媶鍖呮満
-                    Task.Run(() =>
-                    {
-                        StopMachine(0);
-                        MessageBox.Show($"璁惧缂撳瓨鍖哄綋鍓嶉噸閲�:{Cache_Weight},棰勮鏈�澶ч噸閲忓��:{Cache_MaxWeight},宸茬粡瓒呴噸骞朵笖鎷嗗寘鏈鸿繍琛岋紝绯荤粺涓嬪彂鍋滄満鍛戒护!");
-                        _logger.LogError($"璁惧缂撳瓨鍖哄綋鍓嶉噸閲�:{Cache_Weight},棰勮鏈�澶ч噸閲忓��:{Cache_MaxWeight},宸茬粡瓒呴噸骞朵笖鎷嗗寘鏈鸿繍琛岋紝绯荤粺涓嬪彂鍋滄満鍛戒护!");
- 
-                    });
+                    StopMachine(0);
+                    _logger.LogWarning($"璁惧缂撳瓨鍖哄綋鍓嶉噸閲�:{Cache_Weight},棰勮鏈�澶ч噸閲忓��:{Cache_MaxWeight},宸茬粡瓒呴噸骞朵笖鎷嗗寘鏈鸿繍琛岋紝绯荤粺涓嬪彂鍋滄満鍛戒护!");
 
-                    Thread.Sleep(2000);
-                }else if(recipeManageCache.SystemStatus=="1" && (Cache_MinWeight >= Cache_Weight) && unPackStatus == false)
-                {         
-                    StartAll();
+                }
+                else if (recipeManageCache.SystemStatus == "1" && (Cache_MinWeight >= Cache_Weight) && unPackStatus == false)
+                {
+                    bool unPackWarn = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄牭鏂欏仠铻烘棆"));
+
+                    if (!unPackWarn && plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈篗ES鍏佽杩滅▼")) == true)
+                    {
+                        StartUnPack();
+                    }
                 }
 
                 realtimeStatusList.First(x => x.StatusCode == "Bags_Amount").StatusValue = Bags_Amount;
@@ -409,7 +409,7 @@ namespace SlnMesnac.WPF.Page
 
                     alarmWindow.ShowDialog();
                 });
-            if(status >= 0)
+            if (status >= 0)
             {
                 Task.Run(() =>
                 {
@@ -430,7 +430,8 @@ namespace SlnMesnac.WPF.Page
             if (warnStatusEnum == WarnStatusEnum.鎷嗗寘鏈哄牭鏂欏仠铻烘棆)
             {
                 return 0;
-            }else if(warnStatusEnum == WarnStatusEnum.鐑樺共鏈虹儤骞叉俯搴﹁秴娓� || warnStatusEnum == WarnStatusEnum.鐑樺共鏈烘俯鎺фā鍧楅�氳瓒呮椂)
+            }
+            else if (warnStatusEnum == WarnStatusEnum.鐑樺共鏈虹儤骞叉俯搴﹁秴娓� || warnStatusEnum == WarnStatusEnum.鐑樺共鏈烘俯鎺фā鍧楅�氳瓒呮椂)
             {   // 涓嶅仠
                 return -1;
             }
@@ -438,16 +439,19 @@ namespace SlnMesnac.WPF.Page
             {
                 return 3;
             }
-            else  if(warnStatusEnum == WarnStatusEnum.铻烘棆鏈鸿灪鏃�1鍙橀鍣ㄦ姤璀�)
+            else if (warnStatusEnum == WarnStatusEnum.铻烘棆鏈鸿灪鏃�1鍙橀鍣ㄦ姤璀�)
             {
                 return 4;
-            }else  if (warnStatusEnum == WarnStatusEnum.铻烘棆鏈鸿灪鏃�2鍙橀鍣ㄦ姤璀�)
+            }
+            else if (warnStatusEnum == WarnStatusEnum.铻烘棆鏈鸿灪鏃�2鍙橀鍣ㄦ姤璀�)
             {
                 return 6;
-            }else if (warnStatusEnum.ToString().Contains("纾侀�夋満"))
+            }
+            else if (warnStatusEnum.ToString().Contains("纾侀�夋満"))
             {
                 return 5;
-            }else
+            }
+            else
             {
                 return -1;
             }
@@ -727,29 +731,29 @@ namespace SlnMesnac.WPF.Page
 
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈篗ES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("鎷嗗寘鏈篗ES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("鎷嗗寘鏈篗ES灞忚斀");
                     return;
                 }
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("纾侀�夋満MES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("纾侀�夋満MES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("纾侀�夋満MES灞忚斀");
                     return;
                 }
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("铻烘棆1MES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("铻烘棆1MES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("铻烘棆1MES灞忚斀");
                     return;
                 }
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("铻烘棆2MES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("铻烘棆2MES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("铻烘棆2MES灞忚斀");
                     return;
                 }
                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
                 {
                     StartButton.IsEnabled = false;
                 }));
-              
+
 
                 Task.Run(() =>
                 {
@@ -784,13 +788,12 @@ namespace SlnMesnac.WPF.Page
                     #endregion
                     if (unpackStatus)
                     {
-                        
                         recipeManageCache.SystemStatus = "1";
                         App.Current.Dispatcher.BeginInvoke((Action)(() =>
                         {
                             StartButton.IsEnabled = true;
                         }));
-                       
+
                     }
 
                 });
@@ -819,25 +822,25 @@ namespace SlnMesnac.WPF.Page
                         StopButton.IsEnabled = false;
                     }));
 
-                   
+                    recipeManageCache.SystemStatus = "0";
                     #region 渚濇鎸夊簭鍋滄
                     Task.Run(() =>
                     {
-                        bool result =StopMachine(99);
+                        bool result = StopMachine(99);
                         if (result)
                         {
                             MessageBoxAndLog("涓�閿仠姝㈡墍鏈夋満鍣ㄦ垚鍔�!");
-                            recipeManageCache.SystemStatus = "0";
+
                             App.Current.Dispatcher.BeginInvoke((Action)(() =>
                             {
                                 StopButton.IsEnabled = true;
                             }));
-                            
+
                         }
-                       
+
                     });
                     #endregion
-                  
+
                 }
                 catch (Exception ex)
                 {
@@ -862,22 +865,22 @@ namespace SlnMesnac.WPF.Page
         private bool StopMachine(int stopLevel = 0)
         {
             bool result = false;
-          
+
             plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿繙绋嬪惎鍔�"), false);
             SendPulseSignal("鎷嗗寘鏈鸿繙绋嬪仠姝�");
-            if (stopLevel < 1) return result;
             Thread.Sleep(MachineSleep);
+
             bool unPackStatus1 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈虹郴缁熻繍琛岀姸鎬�"));
             if (unPackStatus1)
             {
-                MessageBox.Show("鎷嗗寘鏈烘湭鎴愬姛鍋滄锛岃鍏堟鏌�");
+                Console.WriteLine("鎷嗗寘鏈烘湭鎴愬姛鍋滄锛岃妫�鏌�");
                 return result;
             }
-
+            if (stopLevel < 1) return true;
             #region 鐑樺共鏈�
             SendPulseSignal("鐑樺共鏈虹噧鐑у仠姝�");
             if (stopLevel < 3) return result;
-          
+
 
             Thread.Sleep(MachineSleep);
             SendPulseSignal("鐑樺共鏈鸿灪鏃嬪仠姝�");
@@ -889,10 +892,10 @@ namespace SlnMesnac.WPF.Page
 
             if (stopLevel < 4) return result;
             plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("铻烘棆1鍚姩"), false);
-            if(stopLevel < 5) return result;
+            if (stopLevel < 5) return result;
             Thread.Sleep(MachineSleep);
             SendPulseSignal("纾侀�夋満涓�閿仠姝�");
-            if(stopLevel < 6) return result;
+            if (stopLevel < 6) return result;
             Thread.Sleep(MachineSleep);
             plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("铻烘棆2鍚姩"), false);
             result = true;
@@ -907,35 +910,43 @@ namespace SlnMesnac.WPF.Page
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void StopUrgentButton_Click(object sender, RoutedEventArgs e)
+        private async void StopUrgentButton_Click(object sender, RoutedEventArgs e)
         {
-            var result = MessageBox.Show("鏄惁纭鎬ュ仠锛�", "纭", MessageBoxButton.YesNo, MessageBoxImage.Warning);
-            if (result == MessageBoxResult.Yes)
+
+            try
             {
-                try
+                if (StopUrgentButton.Content.ToString() == "鎬ュ仠")
                 {
-                    if (StopUrgentButton.Content.ToString() == "鎬ュ仠")
+                    var result = MessageBox.Show("鏄惁纭鎬ュ仠锛�", "纭", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                    if (result == MessageBoxResult.Yes)
                     {
-                        //StopButton.IsEnabled = false;
-                        //StopUrgentButton.Content = "澶嶄綅";
-                        
+                        StopUrgentButton.Background = Brushes.Red;
+                        StopUrgentButton.Content = "澶嶄綅";
+
                         SendPulseSignal("鎷嗗寘鏈鸿繙绋嬫�ュ仠");
-                        recipeManageCache.SystemStatus = "0";
 
+
+                        recipeManageCache.SystemStatus = "0";
                     }
-                    else if (StopUrgentButton.Content.ToString() == "澶嶄綅")
+                }
+                else if (StopUrgentButton.Content.ToString() == "澶嶄綅")
+                {
+                    var result = MessageBox.Show("鏄惁纭澶嶄綅锛�", "纭", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                    if (result == MessageBoxResult.Yes)
                     {
-                        //StopButton.IsEnabled = true;
-                        //StopUrgentButton.Content = "鎬ュ仠";
+                        // StopButton.IsEnabled = true;
+                        StopUrgentButton.Content = "鎬ュ仠";
+                        StopUrgentButton.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#E4B74C"));
                         plc.writeBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿繙绋嬫�ュ仠"), false);
                         recipeManageCache.SystemStatus = "1";
                     }
                 }
-                catch (Exception ex)
-                {
-                    _logger.LogError($"鎷嗗寘鏈鸿繙绋嬫�ュ仠:{ex.Message}");
-                }
             }
+            catch (Exception ex)
+            {
+                _logger.LogError($"鎷嗗寘鏈鸿繙绋嬫�ュ仠:{ex.Message}");
+            }
+
         }
 
         #region 鎷嗗寘鏈�
@@ -948,9 +959,14 @@ namespace SlnMesnac.WPF.Page
         {
             try
             {
+                if(StopUrgentButton.Content.ToString() == "澶嶄綅")
+                {
+                    MessageBox.Show("璇峰厛鐐瑰嚮澶嶄綅鎸夐挳");
+                    return;
+                }
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈篗ES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("鎷嗗寘鏈篗ES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("鎷嗗寘鏈篗ES灞忚斀");
                     return;
                 }
                 bool unPackWarn = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄牭鏂欏仠铻烘棆"));
@@ -1031,7 +1047,7 @@ namespace SlnMesnac.WPF.Page
             {
                 if (plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("纾侀�夋満MES鍏佽杩滅▼")) == false)
                 {
-                    MessageBox.Show("纾侀�夋満MES鍏佽杩滅▼锛屾湭鍒囨崲杩滅▼");
+                    MessageBox.Show("纾侀�夋満MES灞忚斀");
                     return;
                 }
                 //鍒ゆ柇鎶ヨ---
@@ -1361,7 +1377,7 @@ namespace SlnMesnac.WPF.Page
                     Thread.Sleep(MachineSleep);
                     result = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("铻烘棆2鍚姩"));
                 }
-                
+
             }
             catch (Exception ex)
             {
@@ -1565,7 +1581,7 @@ namespace SlnMesnac.WPF.Page
                 bool startFlag = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鐑樺共鏈哄弽棣堢噧鐑у惎鍔�"));
                 if (!startFlag)
                 {
-                    MessageBox.Show($"鎷嗗寘鏈哄惎鍔ㄥけ璐�:鍓嶆彁鏉′欢鐑樺共鏈虹噧鐑ф湭鎴愬姛鍚姩,璇锋鏌ュ悗閲嶆柊鍚姩");
+                    _logger.LogError($"鎷嗗寘鏈哄惎鍔ㄥけ璐�:鍓嶆彁鏉′欢鐑樺共鏈虹噧鐑ф湭鎴愬姛鍚姩,璇锋鏌ュ悗閲嶆柊鍚姩");
                     return false;
                 }
 
@@ -1580,7 +1596,6 @@ namespace SlnMesnac.WPF.Page
                 plc.writeFloatByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿灪鏃�2棰戠巼璁惧畾"), recipeManageCache.useRecipeManage.UnpackSpiral2);
                 //   plc.writeFloatByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄簾琚嬫満棰戠巼璁惧畾"), int.Parse(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄簾琚嬫満棰戠巼璁惧畾鍊�")));
 
-
                 Thread.Sleep(MachineSleep);
                 // return plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿繍琛岀姸鎬佺郴缁�"));
                 return true;
@@ -1603,7 +1618,7 @@ namespace SlnMesnac.WPF.Page
         /// <summary>
         /// 鎷嗗寘鏈哄弬鏁扮洃鎺�
         /// </summary>
-        private  void RefreshUnPack(List<MachineStatusDto> machineStatusDtos,List<DmsRealtimeStatus> realtimeStatusList)
+        private void RefreshUnPack(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
         {
             try
             {
@@ -1614,7 +1629,7 @@ namespace SlnMesnac.WPF.Page
                 bool unPackStatus3 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鐗╂枡鍒颁綅"));
                 bool unPackStatus4 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("璁惧鎶曟枡"));
                 bool unPackStatus5 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿姹傜Щ璧扮┖鎵樼洏"));
-                
+
                 bool unPackStatus7 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿繛鎺ョ姸鎬�"));
                 bool unPackStatus8 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄牭鏂欏仠铻烘棆"));
 
@@ -1623,39 +1638,39 @@ namespace SlnMesnac.WPF.Page
                 float UnPack_Spiral1_HZ = plc.readFloatByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿灪鏃�1棰戠巼鍙嶉"));
                 float UnPack_Spiral2_HZ = plc.readFloatByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈鸿灪鏃�2棰戠巼鍙嶉"));
                 float UnPack_Waste_HZ = plc.readFloatByAddress(baseBusiness.GetPlcAddressByConfigKey("鎷嗗寘鏈哄簾琚嬫満棰戠巼鍙嶉"));
-               
-
-                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                {
-                    UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
-                    UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
-                    
-                    UnpackStatus2.Text = unPackStatus2.ToString();
-                    UnpackStatus3.Text = unPackStatus3.ToString();
-                    UnpackStatus4.Text = unPackStatus4.ToString();
-                    UnpackStatus5.Text = unPackStatus5.ToString();
 
-                    UnpackStatus7.Fill = unPackStatus7 ? Brushes.Green : Brushes.Red;
-                    UnpackStatus8.Fill = unPackStatus8 ? Brushes.Red : Brushes.Green;
 
-                    UnpackStatus9.Text = UnPack_Flip_HZ.ToString("F2");
-                    UnpackStatus10.Text = UnPack_Roll_HZ.ToString("F2");
-                    UnpackStatus11.Text = UnPack_Spiral1_HZ.ToString("F2");
-                    UnpackStatus12.Text = UnPack_Spiral2_HZ.ToString("F2");
-                    UnpackStatus13.Text = UnPack_Waste_HZ.ToString("F2");
-
-                    if (recipeManageCache.SystemStatus == "1")
-                    {
-                        SystemStatusTxt.Text = "绯荤粺杩愯涓�";
-                        SystemStatusColor.Fill = Brushes.Green;
-                    }
-                    else
-                    {
-                        SystemStatusTxt.Text = "绯荤粺鍋滄満涓�";
-                        SystemStatusColor.Fill = Brushes.Red;
-                    }
-
-                }));
+                App.Current.Dispatcher.BeginInvoke((Action)(() =>
+               {
+                   UnpackStatus0.Fill = UnPack_MesUse_Flag ? Brushes.Green : Brushes.Red;
+                   UnpackStatus1.Fill = UnPack_Status ? Brushes.Green : Brushes.Red;
+
+                   UnpackStatus2.Text = unPackStatus2.ToString();
+                   UnpackStatus3.Text = unPackStatus3.ToString();
+                   UnpackStatus4.Text = unPackStatus4.ToString();
+                   UnpackStatus5.Text = unPackStatus5.ToString();
+
+                   UnpackStatus7.Fill = unPackStatus7 ? Brushes.Green : Brushes.Red;
+                   UnpackStatus8.Fill = unPackStatus8 ? Brushes.Red : Brushes.Green;
+
+                   UnpackStatus9.Text = UnPack_Flip_HZ.ToString("F2");
+                   UnpackStatus10.Text = UnPack_Roll_HZ.ToString("F2");
+                   UnpackStatus11.Text = UnPack_Spiral1_HZ.ToString("F2");
+                   UnpackStatus12.Text = UnPack_Spiral2_HZ.ToString("F2");
+                   UnpackStatus13.Text = UnPack_Waste_HZ.ToString("F2");
+
+                   if (recipeManageCache.SystemStatus == "1")
+                   {
+                       SystemStatusTxt.Text = "绯荤粺杩愯涓�";
+                       SystemStatusColor.Fill = Brushes.Green;
+                   }
+                   else
+                   {
+                       SystemStatusTxt.Text = "绯荤粺鍋滄満涓�";
+                       SystemStatusColor.Fill = Brushes.Red;
+                   }
+
+               }));
 
 
                 //鏁版嵁閲囬泦閮ㄥ垎
@@ -1693,7 +1708,7 @@ namespace SlnMesnac.WPF.Page
         /// <summary>
         /// 纾侀�夋満鍙傛暟鐩戞帶
         /// </summary>
-        private  void RefreshMagNet(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
+        private void RefreshMagNet(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
         {
             try
             {
@@ -1702,13 +1717,13 @@ namespace SlnMesnac.WPF.Page
                 bool MagNet_MesUse_Flag = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("纾侀�夋満MES鍏佽杩滅▼"));
                 bool signal3 = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("纾侀�夋満璁惧鏁呴殰鍙嶉"));
 
-                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                {
-                    MagNetStatus1.Fill = MagNet_Shake_Status ? Brushes.Green : Brushes.Red;
-                    MagNetStatus2.Fill = MagNet_Status ? Brushes.Green : Brushes.Red;
-                    MagNetStatus3.Fill = MagNet_MesUse_Flag ? Brushes.Green : Brushes.Red;
-                    MagNetStatus4.Fill = signal3 ? Brushes.Red : Brushes.Green;
-                }));
+                App.Current.Dispatcher.BeginInvoke((Action)(() =>
+               {
+                   MagNetStatus1.Fill = MagNet_Shake_Status ? Brushes.Green : Brushes.Red;
+                   MagNetStatus2.Fill = MagNet_Status ? Brushes.Green : Brushes.Red;
+                   MagNetStatus3.Fill = MagNet_MesUse_Flag ? Brushes.Green : Brushes.Red;
+                   MagNetStatus4.Fill = signal3 ? Brushes.Red : Brushes.Green;
+               }));
 
                 MachineStatusDto machineStatusDto = new MachineStatusDto();
                 machineStatusDto.deviceId = 1017;
@@ -1738,7 +1753,7 @@ namespace SlnMesnac.WPF.Page
         /// <summary>
         /// 铻烘棆鏈哄弬鏁扮洃鎺�
         /// </summary>
-        private  void RefreshSpiral(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
+        private void RefreshSpiral(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
         {
             try
             {
@@ -1757,23 +1772,23 @@ namespace SlnMesnac.WPF.Page
                 int Spiral1_Set_Speed = int.Parse(baseBusiness.GetPlcAddressByConfigKey("铻烘棆1閫熷害璁惧畾鍊�"));
                 int Spiral2_Set_Speed = int.Parse(baseBusiness.GetPlcAddressByConfigKey("铻烘棆2閫熷害璁惧畾鍊�"));
 
-                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                {
-                    SpiralSignal0.Fill = Spiral1_MesUse_Flag ? Brushes.Green : Brushes.Red;
-                    SpiralSignal1.Fill = Spiral2_MesUse_Flag ? Brushes.Green : Brushes.Red;
-                    SpiralSignal2.Fill = Spiral1_Status ? Brushes.Green : Brushes.Red;
-                    SpiralSignal3.Fill = Spiral2_Status ? Brushes.Green : Brushes.Red;
-                    //鍙橀鍣ㄧ姸鎬�  0姝ｅ父1鏁呴殰
-                    SpiralSignal4.Fill = Spiral1_Inverter_Status ? Brushes.Red : Brushes.Green;
-                    SpiralSignal5.Fill = Spiral2_Inverter_Status ? Brushes.Red : Brushes.Green;
-                    //铻烘棆1 閫熷害浣庝簬80%棰勮
-                    SpiralSignal6.Fill = Spiral1_Speed < Spiral1_Set_Speed * 0.8 ? Brushes.Red : Brushes.Green;
-                    SpiralSignal6_Value.Text = Spiral1_Speed.ToString();
-                    //铻烘棆2 閫熷害浣庝簬80%棰勮
-                    SpiralSignal7.Fill = Spiral2_Speed < Spiral2_Set_Speed * 0.8 ? Brushes.Red : Brushes.Green;
-                    SpiralSignal7_Value.Text = Spiral2_Speed.ToString();
-
-                }));
+                App.Current.Dispatcher.BeginInvoke((Action)(() =>
+               {
+                   SpiralSignal0.Fill = Spiral1_MesUse_Flag ? Brushes.Green : Brushes.Red;
+                   SpiralSignal1.Fill = Spiral2_MesUse_Flag ? Brushes.Green : Brushes.Red;
+                   SpiralSignal2.Fill = Spiral1_Status ? Brushes.Green : Brushes.Red;
+                   SpiralSignal3.Fill = Spiral2_Status ? Brushes.Green : Brushes.Red;
+                   //鍙橀鍣ㄧ姸鎬�  0姝ｅ父1鏁呴殰
+                   SpiralSignal4.Fill = Spiral1_Inverter_Status ? Brushes.Red : Brushes.Green;
+                   SpiralSignal5.Fill = Spiral2_Inverter_Status ? Brushes.Red : Brushes.Green;
+                   //铻烘棆1 閫熷害浣庝簬80%棰勮
+                   SpiralSignal6.Fill = Spiral1_Speed < Spiral1_Set_Speed * 0.8 ? Brushes.Red : Brushes.Green;
+                   SpiralSignal6_Value.Text = Spiral1_Speed.ToString();
+                   //铻烘棆2 閫熷害浣庝簬80%棰勮
+                   SpiralSignal7.Fill = Spiral2_Speed < Spiral2_Set_Speed * 0.8 ? Brushes.Red : Brushes.Green;
+                   SpiralSignal7_Value.Text = Spiral2_Speed.ToString();
+
+               }));
 
 
                 MachineStatusDto machineStatusDto = new MachineStatusDto();
@@ -1815,7 +1830,7 @@ namespace SlnMesnac.WPF.Page
         /// <summary>
         /// 鐑樺共鏈哄弬鏁扮洃鎺�
         /// </summary>
-        private  void RefreshHot(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
+        private void RefreshHot(List<MachineStatusDto> machineStatusDtos, List<DmsRealtimeStatus> realtimeStatusList)
         {
             try
             {
@@ -1840,33 +1855,33 @@ namespace SlnMesnac.WPF.Page
                 int signal7_2 = plc.readByteByAddress(baseBusiness.GetPlcAddressByConfigKey("鐑樺共鏈烘姤璀�"));
 
 
-                 App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                {
-                    HotSignal1_1.Fill = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
-                    HotSignal1_1_Value.Text = ChangeHotStatus(Hot_Spiral_Status);
-                    HotSignal2_1.Fill = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;
-                    HotSignal2_1_Value.Text = ChangeHotStatus(Hot_Fan_Status);
-                    HotSignal3_1.Fill = Hot_Burn_Status == 1 ? Brushes.Green : Brushes.Red;
-                    HotSignal3_1_Value.Text = ChangeHotStatus(Hot_Burn_Status);
+                App.Current.Dispatcher.BeginInvoke((Action)(() =>
+               {
+                   HotSignal1_1.Fill = Hot_Spiral_Status == 1 ? Brushes.Green : Brushes.Red;
+                   HotSignal1_1_Value.Text = ChangeHotStatus(Hot_Spiral_Status);
+                   HotSignal2_1.Fill = Hot_Fan_Status == 1 ? Brushes.Green : Brushes.Red;
+                   HotSignal2_1_Value.Text = ChangeHotStatus(Hot_Fan_Status);
+                   HotSignal3_1.Fill = Hot_Burn_Status == 1 ? Brushes.Green : Brushes.Red;
+                   HotSignal3_1_Value.Text = ChangeHotStatus(Hot_Burn_Status);
 
-                    HotSignal1_2.Fill = signal1_2 ? Brushes.Green : Brushes.Red;
-                    HotSignal2_2.Fill = signal2_2 ? Brushes.Green : Brushes.Red;
-                    HotSignal3_2.Fill = signal3_2 ? Brushes.Green : Brushes.Red;
+                   HotSignal1_2.Fill = signal1_2 ? Brushes.Green : Brushes.Red;
+                   HotSignal2_2.Fill = signal2_2 ? Brushes.Green : Brushes.Red;
+                   HotSignal3_2.Fill = signal3_2 ? Brushes.Green : Brushes.Red;
 
-                    HotSignal4_1.Fill = signal4_1 ? Brushes.Green : Brushes.Red;
-                    HotSignal4_2.Fill = signal14_2 ? Brushes.Red : Brushes.Green;
+                   HotSignal4_1.Fill = signal4_1 ? Brushes.Green : Brushes.Red;
+                   HotSignal4_2.Fill = signal14_2 ? Brushes.Red : Brushes.Green;
 
 
-                    HotSignal5_1_Value.Text = ((double)Hot_Drying_Temperature / 10).ToString();
-                    HotSignal5_2_Value.Text = ((double)Hot_Heat_Temperature / 10).ToString();
-                    HotSignal6_1_Value.Text = ((double)Hot_OutAir_Temperature / 10).ToString();
-                    HotSignal6_2_Value.Text = ((double)Hot_OutPut_Rate / 10).ToString();
+                   HotSignal5_1_Value.Text = ((double)Hot_Drying_Temperature / 10).ToString();
+                   HotSignal5_2_Value.Text = ((double)Hot_Heat_Temperature / 10).ToString();
+                   HotSignal6_1_Value.Text = ((double)Hot_OutAir_Temperature / 10).ToString();
+                   HotSignal6_2_Value.Text = ((double)Hot_OutPut_Rate / 10).ToString();
 
-                    HotSignal7_1.Fill = signal7_1 ? Brushes.Red : Brushes.Green;
-                    HotSignal7_2.Fill = signal7_2 == 0 ? Brushes.Green : Brushes.Red;
-                    HotSignal7_2_Value.Text = ChangeHotWarn(signal7_2);
+                   HotSignal7_1.Fill = signal7_1 ? Brushes.Red : Brushes.Green;
+                   HotSignal7_2.Fill = signal7_2 == 0 ? Brushes.Green : Brushes.Red;
+                   HotSignal7_2_Value.Text = ChangeHotWarn(signal7_2);
 
-                }));
+               }));
 
 
 
@@ -1897,14 +1912,14 @@ namespace SlnMesnac.WPF.Page
                 machineStatusDtos.Add(machineStatusDto);
 
                 //璁惧鍙傛暟瀹炴椂鏇存柊
-                realtimeStatusList.First(x => x.StatusCode == "Hot_Spiral_Status").StatusValue = (Hot_Spiral_Status==1).ToString();
-                realtimeStatusList.First(x => x.StatusCode == "Hot_Fan_Status").StatusValue = (Hot_Fan_Status==1).ToString();
-                realtimeStatusList.First(x => x.StatusCode == "Hot_Burn_Status").StatusValue = (Hot_Burn_Status==1).ToString();
+                realtimeStatusList.First(x => x.StatusCode == "Hot_Spiral_Status").StatusValue = (Hot_Spiral_Status == 1).ToString();
+                realtimeStatusList.First(x => x.StatusCode == "Hot_Fan_Status").StatusValue = (Hot_Fan_Status == 1).ToString();
+                realtimeStatusList.First(x => x.StatusCode == "Hot_Burn_Status").StatusValue = (Hot_Burn_Status == 1).ToString();
 
                 realtimeStatusList.First(x => x.StatusCode == "Hot_Drying_Temperature").StatusValue = ((double)Hot_Drying_Temperature / 10).ToString();
-                realtimeStatusList.First(x => x.StatusCode == "Hot_Heat_Temperature").StatusValue   = ((double)Hot_Heat_Temperature / 10).ToString();;
+                realtimeStatusList.First(x => x.StatusCode == "Hot_Heat_Temperature").StatusValue = ((double)Hot_Heat_Temperature / 10).ToString(); ;
                 realtimeStatusList.First(x => x.StatusCode == "Hot_OutAir_Temperature").StatusValue = ((double)Hot_OutAir_Temperature / 10).ToString();
-                realtimeStatusList.First(x => x.StatusCode == "Hot_OutPut_Rate").StatusValue        = ((double)Hot_OutPut_Rate / 10).ToString();
+                realtimeStatusList.First(x => x.StatusCode == "Hot_OutPut_Rate").StatusValue = ((double)Hot_OutPut_Rate / 10).ToString();
 
 
 
diff --git a/SlnMesnac.WPF/Page/SystemAlarmWindow.xaml b/SlnMesnac.WPF/Page/SystemAlarmWindow.xaml
index 5a6829f..99f74bd 100644
--- a/SlnMesnac.WPF/Page/SystemAlarmWindow.xaml
+++ b/SlnMesnac.WPF/Page/SystemAlarmWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.WPF.Page"
         mc:Ignorable="d"
-        Title="Alarm" Height="350" Width="600" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Topmost="True" Background="Red">
+        Title="Alarm" Height="350" Width="600" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"  Background="Red">
     <Border Margin="5" Background="LightGoldenrodYellow" CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="White" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
diff --git a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
index 7c8a6cf..0089ad3 100644
--- a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
+++ b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
@@ -34,16 +34,17 @@ namespace SlnMesnac.WPF.Page
         {
             InitializeComponent();
             MaxWeightTxt.Text = recipeManageCache.MaxBufferWeight.ToString();
+            MinWeightTxt.Text = recipeManageCache.MinBufferWeight.ToString();
         }
      
         private void MaxWeightChangeButton_Click(object sender, RoutedEventArgs e)
         {
            bool flag =  double.TryParse(MaxWeightTxt.Text,out double maxValue);
            bool flag2 =  double.TryParse(MinWeightTxt.Text,out double minValue);
-            if (flag&&flag2)
+            if (flag&&flag2&& maxValue>minValue)
             {
                 recipeManageCache.MaxBufferWeight = maxValue;
-
+                recipeManageCache.MinBufferWeight = minValue;
             }
             else
             {