From 67fc638cea11f4eec96c14020a6288b28b1484ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Tue, 13 Aug 2024 14:00:43 +0800
Subject: [PATCH] SpecialLabelBlue185

---
 .../MainDetailControlAction.cs                |  4 ++--
 .../Mesnac.Action.ChemicalWeighing/Qu/Sb.cs   | 20 ++++++++++++++-----
 .../Data/MCProject/nodeForm/MainDetail.xml    |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index c504a8e..89750d7 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -589,10 +589,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                     ThreadPool.QueueUserWorkItem((ty) =>
                     {
                         AlarmControl();
-                        sb.Action();
+                       
                         if (UserJudge.IsSettingNormalUser)
                         {
-                          
+                            sb.Action();
 
                         }
                           
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
index 07c340a..f30108f 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
@@ -117,6 +117,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
                 Add(SpecialLabelBlue549);
                 Add(SpecialLabelBlue543);
 				  Add(SpecialLabelBlue205);
+
 				  Add(SpecialLabelBlue204);
 				  Add(SpecialLabelBlue361);
             }
@@ -247,8 +248,10 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             {
 				Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue483);
-				Add(SpecialLabelBlue553);
-				Add(SpecialLabelBlue569);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
+              
+                Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue275);
 				Add(SpecialLabelBlue509);
 				Add(SpecialLabelBlue513);
@@ -264,7 +267,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             {
 Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue483);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				
 				Add(SpecialLabelBlue275);
@@ -279,7 +283,8 @@ Add(SpecialLabelBlue465);
             {
 Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue483);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue494);
@@ -294,7 +299,8 @@ Add(SpecialLabelBlue465);
             {
 Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue483);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				
@@ -546,6 +552,10 @@ public SpecialLabelBlue SpecialLabelBlue516 { get; set; }
         public SpecialLabelBlue SpecialLabelBlue228 { get; set; }
         public SpecialLabelBlue SpecialLabelBlue230 { get; set; }
 
+        public SpecialLabelBlue SpecialLabelBlue185 { get; set; }
+
+        
+
         public bool GetValue(string address)
         {
          var plc=   PlcConnect.Instance.ReadBool(address).Content;
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
index f55d50e..b72e32d 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
@@ -12976,7 +12976,7 @@
         <Property name="BackColor">MintCream</Property>
         <Property name="Location">344, 328</Property>
         <Property name="Name">SpecialLabelBlue483</Property>
-        <Property name="Size">365, 1</Property>
+        <Property name="Size">265, 1</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue492" children="Controls">
         <Property name="Format" />