From b6b328bfc2714b11fb26890a8d4b42a163bd2801 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Mon, 18 Dec 2023 08:41:00 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E9=98=80?=
 =?UTF-8?q?=E9=97=A8=E5=BD=A2=E6=80=81=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E6=8C=87=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjDeliver/DeliverInitAction.cs            |   2 +-
 .../Data/MCProject/nodeForm/LjDeliver.xml     | 304 +-----------------
 2 files changed, 3 insertions(+), 303 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index a0d8da4..b31232a 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -606,7 +606,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP13, PlcTemp.DV1PCP13_AlarmR, PlcTemp.DV1PCP13_SetR, PlcTemp.DV1PCP13_AlarmL, PlcTemp.DV1PCP13_SetL, 1);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP14, PlcTemp.DV1PCP14_AlarmR, PlcTemp.DV1PCP14_SetR, PlcTemp.DV1PCP14_AlarmL, PlcTemp.DV1PCP14_SetL, 1);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP15, PlcTemp.DV1PCP15_AlarmR, PlcTemp.DV1PCP15_SetR, PlcTemp.DV1PCP15_AlarmL, PlcTemp.DV1PCP15_SetL, 0);
-            ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, 0);
+            ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP16, PlcTemp.DV1PCP16_AlarmL, PlcTemp.DV1PCP16_SetL, PlcTemp.DV1PCP16_AlarmR, PlcTemp.DV1PCP16_SetR, 2);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP17, PlcTemp.DV1PCP17_AlarmR, PlcTemp.DV1PCP17_SetR, PlcTemp.DV1PCP17_AlarmL, PlcTemp.DV1PCP17_SetL, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP18, PlcTemp.DV1PCP18_AlarmR, PlcTemp.DV1PCP18_SetR, PlcTemp.DV1PCP18_AlarmL, PlcTemp.DV1PCP18_SetL, 0);
             ControlsHelper.SetThreeWayValve(ThreeWayValveE.DV1PCP19, PlcTemp.DV1PCP19_AlarmR, PlcTemp.DV1PCP19_SetR, PlcTemp.DV1PCP19_AlarmL, PlcTemp.DV1PCP19_SetL, 0);
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
index 059cc9b..0e29bcd 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/LjDeliver.xml
@@ -276,306 +276,6 @@
         <Property name="Name">SPV1DBT01</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="HR1OSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1551, 415</Property>
-        <Property name="Name">HR1OSI02</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="HR1NSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1464, 417</Property>
-        <Property name="Name">HR1NSI02</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="HR1MSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1405, 417</Property>
-        <Property name="Name">HR1MSI02</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="HR1LSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1346, 417</Property>
-        <Property name="Name">HR1LSI02</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="HR1KSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1287, 420</Property>
-        <Property name="Name">HR1KSI02</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="HR1JSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1194, 416</Property>
-        <Property name="Name">HR1JSI02</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="HR1FSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">925, 417</Property>
-        <Property name="Name">HR1FSI02</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="HR1BSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">653, 417</Property>
-        <Property name="Name">HR1BSI02</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="HR1ASI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">594, 416</Property>
-        <Property name="Name">HR1ASI02</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="HR1ISI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1135, 416</Property>
-        <Property name="Name">HR1ISI02</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="HR1HSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1076, 416</Property>
-        <Property name="Name">HR1HSI02</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="HR1GSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">1016, 416</Property>
-        <Property name="Name">HR1GSI02</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="HR1ESI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">866, 417</Property>
-        <Property name="Name">HR1ESI02</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="HR1DSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">771, 417</Property>
-        <Property name="Name">HR1DSI02</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="HR1CSI02" 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">0</Property>
-        <Property name="ForeColor">White</Property>
-        <Property name="Location">712, 417</Property>
-        <Property name="Name">HR1CSI02</Property>
-        <Property name="Size">11, 12</Property>
-      </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue508" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />
@@ -689,9 +389,9 @@
         <Property name="ZLDName" />
         <Property name="ALMTName" />
         <Property name="ALMDName" />
-        <Property name="Location">458, 175</Property>
+        <Property name="Location">467, 174</Property>
         <Property name="Name">DV1PCP16</Property>
-        <Property name="Size">22, 12</Property>
+        <Property name="Size">13, 22</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.SpecialLabelBlue, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SpecialLabelBlue513" children="Controls">
         <Property name="Format" />