From c0cc0c029a5310b0004e924150008958b6ab342b Mon Sep 17 00:00:00 2001
From: "nodyang@aliyun.com" <nodyang@aliyun.com>
Date: Mon, 7 Oct 2024 21:24:31 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=AE=A1=E9=81=93=E5=8F=98=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index 583072c..c948fc9 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 > 4)
+            if (bao > 2)
             {
                 bao = 0;  
                 try
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs
index f08e1f7..f30108f 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.4");
+            boo = GetValue("M155.3");
             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,7 +288,8 @@ Add(SpecialLabelBlue465);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue494);
-				
+				Add(SpecialLabelBlue207);
+				Add(SpecialLabelBlue362);
             }
 
 
@@ -302,12 +303,7 @@ Add(SpecialLabelBlue465);
                 Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
-                Add(SpecialLabelBlue207);
-                Add(SpecialLabelBlue362);
-
-
-
-
+				
             }
 
 
@@ -376,10 +372,7 @@ Add(SpecialLabelBlue233);
 				Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-                
-                    Add(SpecialLabelBlue185);
-
-                Add(SpecialLabelBlue553);
+				Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue275);
 				Add(SpecialLabelBlue509);
@@ -396,8 +389,7 @@ Add(SpecialLabelBlue233);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-                Add(SpecialLabelBlue185);
-                Add(SpecialLabelBlue553);
+				Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue275);
 				Add(SpecialLabelBlue509);
@@ -413,8 +405,7 @@ Add(SpecialLabelBlue372);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-                Add(SpecialLabelBlue185);
-                Add(SpecialLabelBlue553);
+				Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue494);
@@ -428,8 +419,7 @@ Add(SpecialLabelBlue372);
 Add(SpecialLabelBlue372);
 				Add(SpecialLabelBlue369);
 				Add(SpecialLabelBlue373);
-                Add(SpecialLabelBlue185);
-                Add(SpecialLabelBlue553);
+				Add(SpecialLabelBlue553);
 				Add(SpecialLabelBlue569);
 				Add(SpecialLabelBlue208);
 				Add(SpecialLabelBlue207);
@@ -443,25 +433,16 @@ Add(SpecialLabelBlue372);
                     SetLightGreen(item);
                 }
             }
-            ls.Clear();
         }
 
         public void SetWhite(SpecialLabelBlue special)
         {
-            if (special.BackColor != Color.White)
-            {
-                special.BackColor = Color.White;
-            }
-            
+            special.BackColor = Color.White;
         }
 
         public void SetLightGreen(SpecialLabelBlue special)
         {
-            if(special.BackColor != Color.Yellow)
-            {
-                special.BackColor = Color.Yellow;
-            }
-           
+            special.BackColor = Color.Yellow;
         }
 
         public SpecialLabelBlue SpecialLabelBlue463 { get; set; }