From 90c84700e1db4da5dda0700926f0af1d9a0f30b2 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Sun, 17 Dec 2023 10:17:04 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=85=AC=E5=B7=AE=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=20=E7=BB=B4=E4=BF=AE=E5=BC=80=E5=85=B3=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E9=A2=9C=E8=89=B2=20=E8=BE=93=E9=80=81=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B0=8F=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/ControlsHelper.cs             |  14 ++
 .../AutoControl/InitAction.cs                 |   3 +
 .../Data/MCProject/nodeForm/AutoControlC.xml  |  15 --
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 200 ++----------------
 4 files changed, 31 insertions(+), 201 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs
index 4502108..165a8ac 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/ControlsHelper.cs
@@ -223,6 +223,18 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             TextE.DryW10.MCValue = Dry.RecipePlcViews[9].Set;
             TextE.DryW11.MCValue = Dry.RecipePlcViews[10].Set;
             TextE.DryW12.MCValue = Dry.RecipePlcViews[11].Set;
+            TextE.DryT1.MCValue = Dry.RecipePlcViews[0].Tolerance;
+            TextE.DryT2.MCValue = Dry.RecipePlcViews[1].Tolerance;
+            TextE.DryT3.MCValue = Dry.RecipePlcViews[2].Tolerance;
+            TextE.DryT4.MCValue = Dry.RecipePlcViews[3].Tolerance;
+            TextE.DryT5.MCValue = Dry.RecipePlcViews[4].Tolerance;
+            TextE.DryT6.MCValue = Dry.RecipePlcViews[5].Tolerance;
+            TextE.DryT7.MCValue = Dry.RecipePlcViews[6].Tolerance;
+            TextE.DryT8.MCValue = Dry.RecipePlcViews[7].Tolerance;
+            TextE.DryT9.MCValue = Dry.RecipePlcViews[8].Tolerance;
+            TextE.DryT10.MCValue = Dry.RecipePlcViews[9].Tolerance;
+            TextE.DryT11.MCValue = Dry.RecipePlcViews[10].Tolerance;
+            TextE.DryT12.MCValue = Dry.RecipePlcViews[11].Tolerance;
             TextE.DryWaitTime.MCValue = Dry.RecipeSteps[1].MixTime;
             TextE.DryOutDelayTime.MCValue = Dry.RecipeSteps[2].MixTime;
             TextE.DrySpeed1.MCValue = Dry.RecipeSteps[0].MixSpeed;
@@ -234,6 +246,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
         {
             TextE.MaterialWeight1.MCValue = Gel.RecipePlcViews[0].Set;
             TextE.MaterialWeight2.MCValue = Gel.RecipePlcViews[1].Set;
+            TextE.MaterialTolerance1.MCValue = Gel.RecipePlcViews[0].Tolerance;
+            TextE.MaterialTolerance2.MCValue = Gel.RecipePlcViews[1].Tolerance;
             TextE.GelSpeedSet.MCValue = Gel.RecipeSteps[0].MixSpeed;
             TextE.GelPosTimeA.MCValue = Gel.RecipeSteps[2].MixTemp;
             TextE.GelNagTimeB.MCValue = Gel.RecipeSteps[2].MixSpeed;
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
index aba214b..bbc39f1 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/InitAction.cs
@@ -124,10 +124,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             if (rd[ControlsHelper.SingleSelect(RadioE) - 1])
             {
                 LabelE.RepairState.MCValue = "开";
+                LabelE.RepairState.BackColor = Color.Red;
             }
             else
             {
                 LabelE.RepairState.MCValue = "关";
+                LabelE.RepairState.BackColor = Color.LightGreen;
+
             }
         }
 
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
index 0d73f3f..0a10db1 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
@@ -1358,7 +1358,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 354</Property>
         <Property name="Name">DryT12</Property>
         <Property name="Size">46, 26</Property>
@@ -1492,7 +1491,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 324</Property>
         <Property name="Name">DryT11</Property>
         <Property name="Size">46, 26</Property>
@@ -1626,7 +1624,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 294</Property>
         <Property name="Name">DryT10</Property>
         <Property name="Size">46, 26</Property>
@@ -1760,7 +1757,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 264</Property>
         <Property name="Name">DryT9</Property>
         <Property name="Size">46, 26</Property>
@@ -1894,7 +1890,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 234</Property>
         <Property name="Name">DryT8</Property>
         <Property name="Size">46, 26</Property>
@@ -2028,7 +2023,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 204</Property>
         <Property name="Name">DryT7</Property>
         <Property name="Size">46, 26</Property>
@@ -2162,7 +2156,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 174</Property>
         <Property name="Name">DryT6</Property>
         <Property name="Size">46, 26</Property>
@@ -2296,7 +2289,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 144</Property>
         <Property name="Name">DryT5</Property>
         <Property name="Size">46, 26</Property>
@@ -2430,7 +2422,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 114</Property>
         <Property name="Name">DryT4</Property>
         <Property name="Size">46, 26</Property>
@@ -2564,7 +2555,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 84</Property>
         <Property name="Name">DryT3</Property>
         <Property name="Size">46, 26</Property>
@@ -2698,7 +2688,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 54</Property>
         <Property name="Name">DryT2</Property>
         <Property name="Size">46, 26</Property>
@@ -2832,7 +2821,6 @@
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
         <Property name="TextName" />
-        <Property name="Text">0.2</Property>
         <Property name="Location">397, 24</Property>
         <Property name="Name">DryT1</Property>
         <Property name="Size">46, 26</Property>
@@ -3725,7 +3713,6 @@
             <Property name="MCVisible">True</Property>
             <Property name="MCEnabled">True</Property>
             <Property name="TextName" />
-            <Property name="Text">0.2</Property>
             <Property name="Location">86, 52</Property>
             <Property name="Name">ManualTolerance</Property>
             <Property name="Size">80, 21</Property>
@@ -3960,7 +3947,6 @@
           <Property name="MCVisible">True</Property>
           <Property name="MCEnabled">True</Property>
           <Property name="TextName" />
-          <Property name="Text">0.2</Property>
           <Property name="Location">407, 54</Property>
           <Property name="Name">MaterialTolerance2</Property>
           <Property name="Size">80, 26</Property>
@@ -4500,7 +4486,6 @@
           <Property name="MCVisible">True</Property>
           <Property name="MCEnabled">True</Property>
           <Property name="TextName" />
-          <Property name="Text">0.2</Property>
           <Property name="Location">407, 24</Property>
           <Property name="Name">MaterialTolerance1</Property>
           <Property name="Size">80, 26</Property>
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index f2c710c..51adb43 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -565,7 +565,7 @@
         <Property name="BackColor">Aqua</Property>
         <Property name="Location">596, 84</Property>
         <Property name="Name">SpecialLabelBlue509</Property>
-        <Property name="Size">730, 1</Property>
+        <Property name="Size">26, 1</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue510" children="Controls">
         <Property name="Format" />
@@ -635,7 +635,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">458, 128</Property>
+        <Property name="Location">458, 175</Property>
         <Property name="Name">DV1PCP16</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -653,7 +653,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">468, 131</Property>
+        <Property name="Location">468, 178</Property>
         <Property name="Name">SpecialLabelBlue513</Property>
         <Property name="Size">106, 3</Property>
       </Object>
@@ -1832,7 +1832,7 @@
         <Property name="BackColor">Aqua</Property>
         <Property name="Location">527, 112</Property>
         <Property name="Name">SpecialLabelBlue656</Property>
-        <Property name="Size">249, 1</Property>
+        <Property name="Size">95, 1</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue657" children="Controls">
         <Property name="Format" />
@@ -1868,7 +1868,7 @@
         <Property name="BackColor">Aqua</Property>
         <Property name="Location">568, 60</Property>
         <Property name="Name">SpecialLabelBlue655</Property>
-        <Property name="Size">304, 1</Property>
+        <Property name="Size">54, 1</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue654" children="Controls">
         <Property name="Format" />
@@ -1904,7 +1904,7 @@
         <Property name="BackColor">Aqua</Property>
         <Property name="Location">485, 32</Property>
         <Property name="Name">SpecialLabelBlue653</Property>
-        <Property name="Size">923, 1</Property>
+        <Property name="Size">138, 1</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue652" children="Controls">
         <Property name="Format" />
@@ -1978,92 +1978,6 @@
         <Property name="Name">MCLabel273</Property>
         <Property name="Size">41, 12</Property>
       </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue648" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">544, 516</Property>
-        <Property name="Name">SpecialLabelBlue648</Property>
-        <Property name="Size">19, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue649" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">528, 456</Property>
-        <Property name="Name">SpecialLabelBlue649</Property>
-        <Property name="Size">17, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue650" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">531, 486</Property>
-        <Property name="Name">SpecialLabelBlue650</Property>
-        <Property name="Size">38, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf19" children="Controls">
-        <Property name="StatusName" />
-        <Property name="Status">TurnOff</Property>
-        <Property name="Location">563, 509</Property>
-        <Property name="Name">Jzf19</Property>
-        <Property name="Size">13, 11</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf20" children="Controls">
-        <Property name="StatusName" />
-        <Property name="Status">TurnOff</Property>
-        <Property name="Location">521, 479</Property>
-        <Property name="Name">Jzf20</Property>
-        <Property name="Size">13, 11</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue651" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">544, 456</Property>
-        <Property name="Name">SpecialLabelBlue651</Property>
-        <Property name="Size">1, 60</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue644" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -2208,92 +2122,6 @@
         <Property name="Name">SpecialLabelBlue643</Property>
         <Property name="Size">3, 799</Property>
       </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue641" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">502, 280</Property>
-        <Property name="Name">SpecialLabelBlue641</Property>
-        <Property name="Size">19, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue640" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">486, 220</Property>
-        <Property name="Name">SpecialLabelBlue640</Property>
-        <Property name="Size">17, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue638" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">489, 250</Property>
-        <Property name="Name">SpecialLabelBlue638</Property>
-        <Property name="Size">38, 1</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf18" children="Controls">
-        <Property name="StatusName" />
-        <Property name="Status">TurnOff</Property>
-        <Property name="Location">521, 273</Property>
-        <Property name="Name">Jzf18</Property>
-        <Property name="Size">13, 11</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf17" children="Controls">
-        <Property name="StatusName" />
-        <Property name="Status">TurnOff</Property>
-        <Property name="Location">479, 243</Property>
-        <Property name="Name">Jzf17</Property>
-        <Property name="Size">13, 11</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue637" children="Controls">
-        <Property name="Format" />
-        <Property name="TextName" />
-        <Property name="MCKey" />
-        <Property name="MCDataSourceID" />
-        <Property name="IsDbControl">False</Property>
-        <Property name="InitDataSource" />
-        <Property name="ActionDataSource" />
-        <Property name="BindDataSource" />
-        <Property name="DbOptionType">None</Property>
-        <Property name="MCVisible">True</Property>
-        <Property name="MCEnabled">True</Property>
-        <Property name="TextAlign">MiddleCenter</Property>
-        <Property name="BackColor">Aqua</Property>
-        <Property name="Location">502, 220</Property>
-        <Property name="Name">SpecialLabelBlue637</Property>
-        <Property name="Size">1, 60</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue636" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -2308,7 +2136,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">492, 144</Property>
+        <Property name="Location">492, 211</Property>
         <Property name="Name">SpecialLabelBlue636</Property>
         <Property name="Size">3, 60</Property>
       </Object>
@@ -2326,7 +2154,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">492, 201</Property>
+        <Property name="Location">492, 268</Property>
         <Property name="Name">SpecialLabelBlue635</Property>
         <Property name="Size">10, 3</Property>
       </Object>
@@ -2344,7 +2172,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">479, 144</Property>
+        <Property name="Location">479, 211</Property>
         <Property name="Name">SpecialLabelBlue633</Property>
         <Property name="Size">14, 3</Property>
       </Object>
@@ -2362,7 +2190,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">479, 174</Property>
+        <Property name="Location">479, 241</Property>
         <Property name="Name">SpecialLabelBlue632</Property>
         <Property name="Size">22, 3</Property>
       </Object>
@@ -4779,7 +4607,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">500, 171</Property>
+        <Property name="Location">500, 239</Property>
         <Property name="Name">DV1PCP10</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -4788,7 +4616,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">500, 198</Property>
+        <Property name="Location">500, 266</Property>
         <Property name="Name">DV1PCP09</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -4802,7 +4630,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">458, 142</Property>
+        <Property name="Location">458, 209</Property>
         <Property name="Name">DV1PCP02</Property>
         <Property name="Size">22, 12</Property>
       </Object>
@@ -4811,7 +4639,7 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">458, 171</Property>
+        <Property name="Location">458, 238</Property>
         <Property name="Name">DV1PCP01</Property>
         <Property name="Size">22, 12</Property>
       </Object>