From 9c758ec2ff811b65c34e3943f9229974f81e7a88 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Tue, 7 Nov 2023 14:27:36 +0800
Subject: [PATCH] .

---
 .../Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs         | 4 ++--
 Main/MCEdit/Data/MCProject/nodeDevice.xml                   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
index d3d0d2f..96fb918 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/BasePlcHelper.cs
@@ -2242,7 +2242,7 @@ namespace Mesnac.Action.ChemicalWeighing
         public DataKeyValue solvent_status03 = new DataKeyValue("DB110.DBW406");//完成
         public DataKeyValue solvent_status04 = new DataKeyValue("DB110.DBW408");//清称
         #endregion
-
+        public DataKeyValue solvent1_rate = new DataKeyValue("DB110.DBW413");//固含率
         public DataKeyValue solvent_SystemRuning = new DataKeyValue("DB110.DBW412");//1为有配方；其他没有
         #endregion
 
@@ -2455,7 +2455,7 @@ namespace Mesnac.Action.ChemicalWeighing
         public DataKeyValue solvent2_status03 = new DataKeyValue("DB111.DBW406");//完成
         public DataKeyValue solvent2_status04 = new DataKeyValue("DB111.DBW408");//清称
         #endregion
-
+        public DataKeyValue solvent2_rate = new DataKeyValue("DB111.DBW413");//固含率
         public DataKeyValue solvent2_SystemRuning = new DataKeyValue("DB111.DBW412");//1为有配方；其他没有
         #endregion
     }
diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml
index b243b7c..c74c765 100644
--- a/Main/MCEdit/Data/MCProject/nodeDevice.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml
@@ -3368,7 +3368,7 @@
           <Data name="status_U15_plusStatus" runname="DB109.DBW248" start="124" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="气振阀状态" />
         </Data>
       </Group>
-      <Group name="DB110" block="110" start="0" len="207" access="ReadWrite" remark="地磅称量1" isautoread="True">
+      <Group name="DB110" block="110" start="0" len="208" access="ReadWrite" remark="地磅称量1" isautoread="True">
         <Data>
           <Data name="scaleWeight" runname="DB110.DBW0" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="实时重量" />
           <Data name="finishedNum" runname="DB110.DBW2" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="完成数量" />
@@ -3577,9 +3577,10 @@
           <Data name="status04" runname="DB110.DBW408" start="204" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="清空地磅" />
           <Data name="status05" runname="DB110.DBW410" start="205" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="禁止操作" />
           <Data name="TartTime" runname="DB110.DBW412" start="206" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="配方是否还在称量中：1正在称量,其他不在称量中" />
+          <Data name="D1" runname="DB110.DBW413" start="207" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="固含率" />
         </Data>
       </Group>
-      <Group name="DB111" block="111" start="0" len="207" access="ReadWrite" remark="地磅称量2" isautoread="True">
+      <Group name="DB111" block="111" start="0" len="208" access="ReadWrite" remark="地磅称量2" isautoread="True">
         <Data>
           <Data name="scaleWeight" runname="DB111.DBW0" start="0" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="实时重量" />
           <Data name="finishedNum" runname="DB111.DBW2" start="1" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="完成数量" />
@@ -3788,6 +3789,7 @@
           <Data name="status04" runname="DB111.DBW408" start="204" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="清空地磅" />
           <Data name="status05" runname="DB111.DBW410" start="205" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="禁止操作" />
           <Data name="TartTime" runname="DB111.DBW412" start="206" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="配方是否还在称量中：1正在称量,其他不在称量中" />
+          <Data name="D1" runname="DB111.DBW413" start="207" len="1" method="Default_ShortDiv()" max="" issave="False" subtractor="" remark="固含率" />
         </Data>
       </Group>
       <Group name="DB101" block="101" start="0" len="15" access="ReadWrite" remark="溶剂设备" isautoread="False">