From 3250c96448f7d09060b175f0da81a9f315926c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Fri, 21 Jun 2024 09:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dan/InitAction.cs                         | 25 ++++++-------
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 36 +++++++++----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
index e537386..a24ef60 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
@@ -138,6 +138,7 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
 
 
             cbkA = controll.FirstOrDefault(x => x.Name == "cbkA") as MCCheckBox;
+            backColor = cbkA.BackColor;
             cbkB = controll.FirstOrDefault(x => x.Name == "cbkB") as MCCheckBox;
             cbkC = controll.FirstOrDefault(x => x.Name == "cbkC") as MCCheckBox;
 
@@ -228,24 +229,24 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
 
 
             MCButton2_Click(new object(), new EventArgs());
-            backColor=txtBoxA.BackColor;
+          
             cbkA.CheckedChanged += CbkA_CheckedChanged;
 
         }
 
         private void CbkA_CheckedChanged(object sender, EventArgs e)
         {
-            //if (sender == cbkA)
-            //{
-            //    if (cbkA.Checked)
-            //    {
-            //        txtBoxA.BackColor = Color.Green;
-            //    }
-            //    else
-            //    {
-            //        txtBoxA.BackColor = backColor;
-            //    }
-            //}
+            if (sender == cbkA)
+            {
+                if (cbkA.Checked)
+                {
+                    cbkA.BackColor = Color.Green;
+                }
+                else
+                {
+                    cbkA.BackColor = backColor;
+                }
+            }
         }
 
         private void MCButton2_Click(object sender, EventArgs e)
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index 7b27d9a..cb66d80 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -1625,7 +1625,7 @@
           <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">166, 110</Property>
+          <Property name="Location">100, 110</Property>
           <Property name="Name">CStatus</Property>
           <Property name="Size">11, 12</Property>
         </Object>
@@ -1646,7 +1646,7 @@
           <Property name="Text">状态</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">159, 90</Property>
+          <Property name="Location">99, 90</Property>
           <Property name="Name">MCLabel346</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -1664,12 +1664,12 @@
           <Property name="DbOptionType">None</Property>
           <Property name="MCVisible">True</Property>
           <Property name="MCEnabled">True</Property>
-          <Property name="Text">压送罐2</Property>
+          <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">102, 112</Property>
+          <Property name="Location">73, 112</Property>
           <Property name="Name">linCNum</Property>
-          <Property name="Size">47, 12</Property>
+          <Property name="Size">11, 12</Property>
         </Object>
         <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="linCName" children="Controls">
           <Property name="Format" />
@@ -1709,7 +1709,7 @@
           <Property name="Text">数量</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">93, 90</Property>
+          <Property name="Location">64, 90</Property>
           <Property name="Name">MCLabel333</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -2008,7 +2008,7 @@
           <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">164, 115</Property>
+          <Property name="Location">99, 118</Property>
           <Property name="Name">BStatus</Property>
           <Property name="Size">11, 12</Property>
         </Object>
@@ -2029,7 +2029,7 @@
           <Property name="Text">状态</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">156, 96</Property>
+          <Property name="Location">96, 96</Property>
           <Property name="Name">MCLabel344</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -2047,12 +2047,12 @@
           <Property name="DbOptionType">None</Property>
           <Property name="MCVisible">True</Property>
           <Property name="MCEnabled">True</Property>
-          <Property name="Text">压送罐2</Property>
+          <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">100, 117</Property>
+          <Property name="Location">71, 117</Property>
           <Property name="Name">linBNum</Property>
-          <Property name="Size">47, 12</Property>
+          <Property name="Size">11, 12</Property>
         </Object>
         <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="linBName" children="Controls">
           <Property name="Format" />
@@ -2092,7 +2092,7 @@
           <Property name="Text">数量</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">90, 96</Property>
+          <Property name="Location">61, 96</Property>
           <Property name="Name">MCLabel336</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -2391,7 +2391,7 @@
           <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">151, 110</Property>
+          <Property name="Location">100, 111</Property>
           <Property name="Name">AStatus</Property>
           <Property name="Size">11, 12</Property>
         </Object>
@@ -2412,7 +2412,7 @@
           <Property name="Text">状态</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">149, 91</Property>
+          <Property name="Location">98, 92</Property>
           <Property name="Name">MCLabel342</Property>
           <Property name="Size">29, 12</Property>
         </Object>
@@ -2430,12 +2430,12 @@
           <Property name="DbOptionType">None</Property>
           <Property name="MCVisible">True</Property>
           <Property name="MCEnabled">True</Property>
-          <Property name="Text">压送罐2</Property>
+          <Property name="Text">0</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">98, 111</Property>
+          <Property name="Location">72, 111</Property>
           <Property name="Name">linANum</Property>
-          <Property name="Size">47, 12</Property>
+          <Property name="Size">11, 12</Property>
         </Object>
         <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="linAName" children="Controls">
           <Property name="Format" />
@@ -2475,7 +2475,7 @@
           <Property name="Text">数量</Property>
           <Property name="BackColor">Transparent</Property>
           <Property name="ForeColor">ButtonHighlight</Property>
-          <Property name="Location">90, 92</Property>
+          <Property name="Location">64, 92</Property>
           <Property name="Name">MCLabel340</Property>
           <Property name="Size">29, 12</Property>
         </Object>