From 60c2a9c4c33454f60ee8e8c4df6f1a7588657003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Sun, 9 Jun 2024 18:22:39 +0800
Subject: [PATCH] de

---
 .../Entity/HslControlsEntity.cs               |  6 +++++-
 .../MainDetailControlAction.cs                |  5 ++++-
 DataBlockHelper/DBHelpers/DB2108HelperNew.cs  | 13 +++++++++++-
 .../Data/MCProject/nodeForm/MainDetail.xml    | 20 +++++++++++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
index 4826a19..652eab0 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs
@@ -86,9 +86,13 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
         public HslLanternSimple DayBin6 { get; set; }
         public HslLanternSimple DayBin7 { get; set; }
         public HslLanternSimple DayBin8 { get; set; }
-       
 
 
+        public HslLanternSimple Daybin9 { get; set; }
+        public HslLanternSimple Daybin10 { get; set; }
+        public HslLanternSimple Daybin11 { get; set; }
+
+        public HslLanternSimple Daybin12 { get; set; }
         //湿混机已经加完干混料
 
         public HslLanternSimple FeededDryM1 { get; set; }
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
index 4da1da7..3482c28 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
@@ -375,9 +375,12 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             SetHslLanternSimple9(HslLanternSimpleE.DayBin6, dB2108.Daybin6);
             SetHslLanternSimple9(HslLanternSimpleE.DayBin7, dB2108.Daybin7);
             SetHslLanternSimple9(HslLanternSimpleE.DayBin8, dB2108.Daybin8);
-           
 
 
+            SetHslLanternSimple9(HslLanternSimpleE.Daybin9, dB2108.Daybin9);
+            SetHslLanternSimple9(HslLanternSimpleE.Daybin10, dB2108.Daybin10);
+            SetHslLanternSimple9(HslLanternSimpleE.Daybin11, dB2108.Daybin11);
+            SetHslLanternSimple9(HslLanternSimpleE.Daybin12, dB2108.Daybin12);
 
 
             //湿混机 加完料
diff --git a/DataBlockHelper/DBHelpers/DB2108HelperNew.cs b/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
index 44b56b5..a97c4b0 100644
--- a/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
+++ b/DataBlockHelper/DBHelpers/DB2108HelperNew.cs
@@ -15,7 +15,8 @@ namespace DataBlockHelper.DBHelpers
     {
         public DB2108HelperNew()
         {
-            OperateResult<byte[]> db = PlcConnect.Instance.Read("DB2108.0.0", 108);
+            
+            OperateResult<byte[]> db = PlcConnect.Instance.Read("DB2108.0.0", 72);
             bytes = db.Content;
         }
 
@@ -38,6 +39,16 @@ namespace DataBlockHelper.DBHelpers
         public MainFan Daybin7 => new MainFan(22, bytes);
         public MainFan Daybin8 => new MainFan(24, bytes);
 
+        public MainFan Daybin9 => new MainFan(64, bytes);
+
+
+        public MainFan Daybin10 => new MainFan(66, bytes);
+
+        public MainFan Daybin11 => new MainFan(68, bytes);
+
+
+        public MainFan Daybin12 => new MainFan(70, bytes);
+
         public Time2108 Time=>new Time2108(26,bytes);
 
         public Pressure_HMI PR2PCP04=>new Pressure_HMI(50,bytes);
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
index 4e49260..6eefed3 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
@@ -1,6 +1,26 @@
 
   <Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MainDetail" children="Controls">
     <Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="FeededGelM255" children="Controls">
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslLanternSimple, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Daybin12" children="Controls">
+        <Property name="Location">1745, 289</Property>
+        <Property name="Name">Daybin12</Property>
+        <Property name="Size">7, 7</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslLanternSimple, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Daybin11" children="Controls">
+        <Property name="Location">1434, 290</Property>
+        <Property name="Name">Daybin11</Property>
+        <Property name="Size">7, 7</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslLanternSimple, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Daybin10" children="Controls">
+        <Property name="Location">1193, 291</Property>
+        <Property name="Name">Daybin10</Property>
+        <Property name="Size">7, 7</Property>
+      </Object>
+      <Object type="Mesnac.Controls.ChemicalWeighing.HslLanternSimple, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Daybin9" children="Controls">
+        <Property name="Location">882, 289</Property>
+        <Property name="Name">Daybin9</Property>
+        <Property name="Size">7, 7</Property>
+      </Object>
       <Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabelB" children="Controls">
         <Property name="Format" />
         <Property name="TextName" />