From ee381bf3af5d0bdf01d8343cf8e7cc3bd552a389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Thu, 25 Jul 2024 10:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Qu/InitAction.cs                          | 17 +++++++++++++----
 DataBlockHelper/DBHelpers/DB2119Helper.cs     |  2 +-
 Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml | 19 ++++++++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs
index a8e229a..ccb1bba 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/InitAction.cs
@@ -152,8 +152,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
         HslSwitch HslSwitch13;
         HslSwitch HslSwitch14;
         HslSwitch HslSwitch15;
-       
 
+        HslSwitch HslSwitch16;
 
 
         public void Run(RuntimeParameter runtime)
@@ -399,6 +399,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             HslSwitch15 = controls.FirstOrDefault(x => x.Name == "HslSwitch15") as HslSwitch;
             HslSwitch15.Text = "大仓O";
 
+            HslSwitch16 = controls.FirstOrDefault(x => x.Name == "HslSwitch16") as HslSwitch;
+            HslSwitch16.Text = "回收仓侧吹启停";
 
 
             HslSwitch1.OnSwitchChanged += HslSwitch1_OnSwitchChanged;
@@ -416,7 +418,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             HslSwitch13.OnSwitchChanged += HslSwitch1_OnSwitchChanged;
             HslSwitch14.OnSwitchChanged += HslSwitch1_OnSwitchChanged;
             HslSwitch15.OnSwitchChanged += HslSwitch1_OnSwitchChanged;
-            
+            HslSwitch16.OnSwitchChanged += HslSwitch1_OnSwitchChanged;
 
 
 
@@ -490,7 +492,10 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
                 add = "DB2119.16.6";
             }
 
-
+            if (hsl.Name == "HslSwitch16")
+            {
+                add = "DB2119.16.7";
+            }
 
             var val = PlcConnect.Instance.ReadBool(add).Content;
             PlcConnect.Instance.Write(add, !val);
@@ -1164,8 +1169,12 @@ namespace Mesnac.Action.ChemicalWeighing.Qu
             this.HslSwitch13.SwitchStatus = at.GetBit(4);
             this.HslSwitch14.SwitchStatus = at.GetBit(5);
             this.HslSwitch15.SwitchStatus = at.GetBit(6);
-            
 
+
+
+            var sss = plc.ReadBool("DB2119.16.7").Content;
+
+            this.HslSwitch16.SwitchStatus = sss;
         }
 
     }
diff --git a/DataBlockHelper/DBHelpers/DB2119Helper.cs b/DataBlockHelper/DBHelpers/DB2119Helper.cs
index e09e552..5256e1b 100644
--- a/DataBlockHelper/DBHelpers/DB2119Helper.cs
+++ b/DataBlockHelper/DBHelpers/DB2119Helper.cs
@@ -12,7 +12,7 @@ namespace DataBlockHelper.DBHelpers
     {
         public DB2119Helper()
         {
-            bytes = PlcConnect.Instance.Read("DB2119.0.0", 12).Content;
+            bytes = PlcConnect.Instance.Read("DB2119.0.0", 14).Content;
 
             var a=bytes.First();
             VesselA = a.GetBit(0);
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml
index a78518b..ee2a3f2 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmQu.xml
@@ -1,5 +1,18 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FrmQu" children="Controls">
+    <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox10" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch16" children="Controls">
+        <Property name="Location">43, 20</Property>
+        <Property name="Name">HslSwitch16</Property>
+        <Property name="Size">119, 121</Property>
+      </Object>
+      <Property name="TabStop">False</Property>
+      <Property name="Text">回收仓侧吹启停</Property>
+      <Property name="Location">34, 922</Property>
+      <Property name="Name">GroupBox10</Property>
+      <Property name="Size">1253, 162</Property>
+      <Property name="TabIndex">21</Property>
+    </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox9" children="Controls">
       <Object type="Mesnac.Controls.ChemicalWeighing.HslSwitch, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="HslSwitch15" children="Controls">
         <Property name="Location">1175, 39</Property>
@@ -78,9 +91,9 @@
       </Object>
       <Property name="TabStop">False</Property>
       <Property name="Text">缓存仓上位机</Property>
-      <Property name="Location">30, 806</Property>
+      <Property name="Location">30, 757</Property>
       <Property name="Name">GroupBox9</Property>
-      <Property name="Size">1257, 146</Property>
+      <Property name="Size">1257, 139</Property>
       <Property name="TabIndex">20</Property>
     </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox8" children="Controls">
@@ -2364,7 +2377,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">1402, 1141</Property>
+    <Property name="Size">1402, 1200</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">缓存队列取消</Property>
     <Property name="WindowState">Normal</Property>