From 07bbdfb48c54b871f3aebd93ffb85fd40200ae57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Thu, 15 Aug 2024 14:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E9=81=93=E5=8F=98=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainDetailControlAction.cs                |  2 +-
 .../Mesnac.Action.ChemicalWeighing/Qu/Sb.cs   | 47 +++++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index c948fc9..583072c 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -581,7 +581,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             ThreadPool.QueueUserWorkItem(new WaitCallback(NewThread));
 
            
-            if (bao > 2)
+            if (bao > 4)
             {
                 bao = 0;  
                 try
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
index f30108f..f08e1f7 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
@@ -46,7 +46,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
 
         public void Action()
         {
-            ls.Clear();
+         
 
             PropertyInfo[] sourcePropertyInfoList = this.GetType().GetProperties();
             foreach (PropertyInfo sourceProperty in sourcePropertyInfoList)
@@ -60,7 +60,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
                 }
 
             }
-
+            ls.Clear();
             //压送A-A
             var boo = GetValue("M172.5");
           
@@ -109,7 +109,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
 
 
             //压送A-D
-            boo = GetValue("M155.3");
+            boo = GetValue("M155.4");
             if (boo)
             {
                 Add(SpecialLabelBlue463);
@@ -228,7 +228,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             boo = GetValue("M160.7");
             if (boo)
             {
- Add(SpecialLabelBlue464);
+                Add(SpecialLabelBlue464);
                 Add(SpecialLabelBlue480);
                 Add(SpecialLabelBlue551);
                 Add(SpecialLabelBlue541);
@@ -265,7 +265,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             boo = GetValue("M181.0");
             if (boo)
             {
-Add(SpecialLabelBlue465);
+                Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue483);
                 Add(SpecialLabelBlue185);
                 Add(SpecialLabelBlue553);
@@ -288,8 +288,7 @@ Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue494);
-				Add(SpecialLabelBlue207);
-				Add(SpecialLabelBlue362);
+				
             }
 
 
@@ -303,7 +302,12 @@ Add(SpecialLabelBlue465);
                 Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
-				
+                Add(SpecialLabelBlue207);
+                Add(SpecialLabelBlue362);
+
+
+
+
             }
 
 
@@ -372,7 +376,10 @@ Add(SpecialLabelBlue233);
 				Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-				Add(SpecialLabelBlue553);
+                
+                    Add(SpecialLabelBlue185);
+
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue275);
 				Add(SpecialLabelBlue509);
@@ -389,7 +396,8 @@ Add(SpecialLabelBlue233);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue275);
 				Add(SpecialLabelBlue509);
@@ -405,7 +413,8 @@ Add(SpecialLabelBlue372);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue494);
@@ -419,7 +428,8 @@ Add(SpecialLabelBlue372);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-				Add(SpecialLabelBlue553);
+                Add(SpecialLabelBlue185);
+                Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue207);
@@ -433,16 +443,25 @@ Add(SpecialLabelBlue372);
                     SetLightGreen(item);
                 }
             }
+            ls.Clear();
         }
 
         public void SetWhite(SpecialLabelBlue special)
         {
-            special.BackColor = Color.White;
+            if (special.BackColor != Color.White)
+            {
+                special.BackColor = Color.White;
+            }
+            
         }
 
         public void SetLightGreen(SpecialLabelBlue special)
         {
-            special.BackColor = Color.Yellow;
+            if(special.BackColor != Color.Yellow)
+            {
+                special.BackColor = Color.Yellow;
+            }
+           
         }
 
         public SpecialLabelBlue SpecialLabelBlue463 { get; set; }