From b25eeaaf1ede63520e8626634b4fed82b0d9fe42 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 18 Dec 2023 14:10:07 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=BE=93=E9=80=81=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 275 +++++++++---------
 1 file changed, 145 insertions(+), 130 deletions(-)

diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index ccf48e6..e34803c 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -1,6 +1,138 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjDeliver" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel15" children="Controls">
+      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Jzf5" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">337, 686</Property>
+        <Property name="Name">Jzf5</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="Jzf6" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">330, 676</Property>
+        <Property name="Name">Jzf6</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="Jzf3" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">337, 405</Property>
+        <Property name="Name">Jzf3</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="Jzf4" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">330, 395</Property>
+        <Property name="Name">Jzf4</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="Jzf2" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">337, 121</Property>
+        <Property name="Name">Jzf2</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="Jzf1" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Status">TurnOff</Property>
+        <Property name="Location">330, 111</Property>
+        <Property name="Name">Jzf1</Property>
+        <Property name="Size">13, 11</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Feeding.Fan, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Fan14" children="Controls">
+        <Property name="AlarmValue" />
+        <Property name="StatusName" />
+        <Property name="Status">zsTurnOff</Property>
+        <Property name="Location">319, 653</Property>
+        <Property name="Name">Fan14</Property>
+        <Property name="Size">19, 20</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Feeding.Fan, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Fan15" children="Controls">
+        <Property name="AlarmValue" />
+        <Property name="StatusName" />
+        <Property name="Status">zsTurnOff</Property>
+        <Property name="Location">319, 372</Property>
+        <Property name="Name">Fan15</Property>
+        <Property name="Size">19, 20</Property>
+      </Object>
+      <Object type="Mesnac.Controls.Feeding.Fan, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Fan16" children="Controls">
+        <Property name="AlarmValue" />
+        <Property name="StatusName" />
+        <Property name="Status">zsTurnOff</Property>
+        <Property name="Location">319, 88</Property>
+        <Property name="Name">Fan16</Property>
+        <Property name="Size">19, 20</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP19" children="Controls">
+        <Property name="ZLTName" />
+        <Property name="ZLDName" />
+        <Property name="ALMTName" />
+        <Property name="ALMDName" />
+        <Property name="Location">1082, 68</Property>
+        <Property name="Name">DV1PCP19</Property>
+        <Property name="Size">22, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP06" children="Controls">
+        <Property name="ZLTName" />
+        <Property name="ZLDName" />
+        <Property name="ALMTName" />
+        <Property name="ALMDName" />
+        <Property name="Location">1023, 69</Property>
+        <Property name="Name">DV1PCP06</Property>
+        <Property name="Size">22, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP20" children="Controls">
+        <Property name="ZLTName" />
+        <Property name="ZLDName" />
+        <Property name="ALMTName" />
+        <Property name="ALMDName" />
+        <Property name="Location">1292, 69</Property>
+        <Property name="Name">DV1PCP20</Property>
+        <Property name="Size">22, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS3DBT07" children="Controls">
+        <Property name="AlarmName" />
+        <Property name="SetName" />
+        <Property name="Location">326, 858</Property>
+        <Property name="Name">AS3DBT07</Property>
+        <Property name="Size">14, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS2DBT07" children="Controls">
+        <Property name="AlarmName" />
+        <Property name="SetName" />
+        <Property name="Location">329, 578</Property>
+        <Property name="Name">AS2DBT07</Property>
+        <Property name="Size">14, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS1DBT07" children="Controls">
+        <Property name="AlarmName" />
+        <Property name="SetName" />
+        <Property name="Location">328, 293</Property>
+        <Property name="Name">AS1DBT07</Property>
+        <Property name="Size">14, 12</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483644" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Location">352, 656</Property>
+        <Property name="Name">SwitchLight2147483644</Property>
+        <Property name="Size">13, 13</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483645" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Location">352, 375</Property>
+        <Property name="Name">SwitchLight2147483645</Property>
+        <Property name="Size">13, 13</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight2147483646" children="Controls">
+        <Property name="StatusName" />
+        <Property name="Location">352, 91</Property>
+        <Property name="Name">SwitchLight2147483646</Property>
+        <Property name="Size">13, 13</Property>
+      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue503" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -190,7 +322,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 847</Property>
+        <Property name="Location">233, 851</Property>
         <Property name="Name">SPV3DBT02</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -210,7 +342,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 832</Property>
+        <Property name="Location">233, 828</Property>
         <Property name="Name">SPV3DBT01</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -230,7 +362,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 565</Property>
+        <Property name="Location">233, 569</Property>
         <Property name="Name">SPV2DBT02</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -250,7 +382,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 550</Property>
+        <Property name="Location">233, 547</Property>
         <Property name="Name">SPV2DBT01</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -270,7 +402,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 281</Property>
+        <Property name="Location">233, 285</Property>
         <Property name="Name">SPV1DBT02</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -290,7 +422,7 @@
         <Property name="MCEnabled">True</Property>
         <Property name="Text">0</Property>
         <Property name="ForeColor">White</Property>
-        <Property name="Location">233, 266</Property>
+        <Property name="Location">233, 262</Property>
         <Property name="Name">SPV1DBT01</Property>
         <Property name="Size">11, 12</Property>
       </Object>
@@ -330,42 +462,15 @@
         <Property name="Name">SpecialLabelBlue507</Property>
         <Property name="Size">3, 77</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP19" children="Controls">
-        <Property name="ZLTName" />
-        <Property name="ZLDName" />
-        <Property name="ALMTName" />
-        <Property name="ALMDName" />
-        <Property name="Location">1083, 66</Property>
-        <Property name="Name">DV1PCP19</Property>
-        <Property name="Size">22, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP06" children="Controls">
-        <Property name="ZLTName" />
-        <Property name="ZLDName" />
-        <Property name="ALMTName" />
-        <Property name="ALMDName" />
-        <Property name="Location">1024, 67</Property>
-        <Property name="Name">DV1PCP06</Property>
-        <Property name="Size">22, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP04" children="Controls">
         <Property name="ZLTName" />
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">557, 97</Property>
+        <Property name="Location">557, 96</Property>
         <Property name="Name">DV1PCP04</Property>
         <Property name="Size">22, 12</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.ThreeWayValve, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="DV1PCP20" children="Controls">
-        <Property name="ZLTName" />
-        <Property name="ZLDName" />
-        <Property name="ALMTName" />
-        <Property name="ALMDName" />
-        <Property name="Location">1293, 67</Property>
-        <Property name="Name">DV1PCP20</Property>
-        <Property name="Size">22, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue511" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -2046,13 +2151,6 @@
         <Property name="Name">SpecialLabelBlue600</Property>
         <Property name="Size">1, 39</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS3DBT07" children="Controls">
-        <Property name="AlarmName" />
-        <Property name="SetName" />
-        <Property name="Location">327, 855</Property>
-        <Property name="Name">AS3DBT07</Property>
-        <Property name="Size">14, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue601" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -2420,9 +2518,9 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">357, 643</Property>
+        <Property name="Location">357, 631</Property>
         <Property name="Name">SpecialLabelBlue615</Property>
-        <Property name="Size">3, 12</Property>
+        <Property name="Size">3, 24</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.Dou, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Dou30" children="Controls">
         <Property name="Location">337, 653</Property>
@@ -2611,13 +2709,6 @@
         <Property name="Name">SpecialLabelBlue596</Property>
         <Property name="Size">1, 39</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS2DBT07" children="Controls">
-        <Property name="AlarmName" />
-        <Property name="SetName" />
-        <Property name="Location">330, 575</Property>
-        <Property name="Name">AS2DBT07</Property>
-        <Property name="Size">14, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue549" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -2985,9 +3076,9 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">357, 360</Property>
+        <Property name="Location">357, 348</Property>
         <Property name="Name">SpecialLabelBlue563</Property>
-        <Property name="Size">3, 12</Property>
+        <Property name="Size">3, 24</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.Dou, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Dou29" children="Controls">
         <Property name="Location">337, 372</Property>
@@ -3140,21 +3231,6 @@
         <Property name="Name">Trucks20</Property>
         <Property name="Size">113, 37</Property>
       </Object>
-      <Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AS1DBT07" children="Controls">
-        <Property name="AlarmName" />
-        <Property name="SetName" />
-        <Property name="Location">329, 290</Property>
-        <Property name="Name">AS1DBT07</Property>
-        <Property name="Size">14, 12</Property>
-      </Object>
-      <Object type="Mesnac.Controls.Feeding.Jzf, Mesnac.Controls.Feeding, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="" children="Controls">
-        <Property name="StatusName" />
-        <Property name="Status">TurnOff</Property>
-        <Property name="Location">233, 255</Property>
-        <Property name="Name">
-        </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="SpecialLabelBlue544" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -4307,9 +4383,9 @@
         <Property name="MCEnabled">True</Property>
         <Property name="TextAlign">MiddleCenter</Property>
         <Property name="BackColor">White</Property>
-        <Property name="Location">357, 78</Property>
+        <Property name="Location">357, 65</Property>
         <Property name="Name">SpecialLabelBlue514</Property>
-        <Property name="Size">3, 12</Property>
+        <Property name="Size">3, 25</Property>
       </Object>
       <Object type="Mesnac.Controls.ChemicalWeighing.Dou, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Dou28" children="Controls">
         <Property name="Location">337, 88</Property>
@@ -4541,67 +4617,6 @@
         <Property name="Name">QiGuanDanYuan8</Property>
         <Property name="Size">99, 74</Property>
       </Object>
-      <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel16" children="Controls">
-        <Object type="Mesnac.Controls.ChemicalWeighing.StateButton, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="StateButton8" children="Controls">
-          <Property name="StatusName">CWSS_PLC.DB100.PLC_ConnectState</Property>
-          <Property name="Status">sssStop</Property>
-          <Property name="Location">11, 6</Property>
-          <Property name="Name">StateButton8</Property>
-          <Property name="Size">68, 67</Property>
-        </Object>
-        <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel271" children="Controls">
-          <Property name="Format" />
-          <Property name="TextName" />
-          <Property name="NewFillColor">Red</Property>
-          <Property name="OldFillColor">DarkGray</Property>
-          <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="Text">系统急停</Property>
-          <Property name="Font">黑体, 9.75pt</Property>
-          <Property name="ForeColor">ControlLightLight</Property>
-          <Property name="Location">13, 148</Property>
-          <Property name="Name">MCLabel271</Property>
-          <Property name="Size">63, 13</Property>
-        </Object>
-        <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel272" children="Controls">
-          <Property name="Format" />
-          <Property name="TextName" />
-          <Property name="NewFillColor">Red</Property>
-          <Property name="OldFillColor">DarkGray</Property>
-          <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="Text">PLC连接状态</Property>
-          <Property name="Font">黑体, 9.75pt</Property>
-          <Property name="ForeColor">ControlLightLight</Property>
-          <Property name="Location">4, 73</Property>
-          <Property name="Name">MCLabel272</Property>
-          <Property name="Size">84, 13</Property>
-        </Object>
-        <Object type="Mesnac.Controls.ChemicalWeighing.SystemStateShow, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SystemStateShow8" children="Controls">
-          <Property name="StatusName">CWSS_PLC.DB100.PLC_SystemStop</Property>
-          <Property name="Status">sssStop</Property>
-          <Property name="Location">16, 92</Property>
-          <Property name="Name">SystemStateShow8</Property>
-          <Property name="Size">55, 54</Property>
-        </Object>
-        <Property name="Location">23, 119</Property>
-        <Property name="Name">Panel16</Property>
-        <Property name="Size">91, 174</Property>
-      </Object>
       <Property name="BackColor">32, 72, 98</Property>
       <Property name="Dock">Fill</Property>
       <Property name="Location">0, 0</Property>