From 517c6fd429d3e1d7424a0f1d9510e38e871572d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Fri, 21 Jun 2024 08:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=AE=E6=B0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dan/InitAction.cs                         | 17 ++++++++--
 DataBlockHelper/DBHelpers/Db2101Helper.cs     | 34 +++++++++----------
 .../Data/MCProject/nodeForm/FormDanQi.xml     |  2 +-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
index ed5ec0b..e537386 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Dan/InitAction.cs
@@ -521,8 +521,21 @@ namespace Mesnac.Action.ChemicalWeighing.Dan
             Ch(cbkN, txtBoxN, HslN, db.SiloN, false);
             Ch(cbkO, txtBoxO, HslO, db.Siloo, false);
 
-            //Ya.Text = db.Ya.ToString();
-            //Yb.Text = db.Yb.ToString();
+            Ya.Text = db.Ya.ToString();
+            Yb.Text = db.Yb.ToString();
+            Yc.Text = db.Yc.ToString();
+            Yd.Text = db.Yd.ToString();
+            Ye.Text = db.Ye.ToString();
+            Yf.Text = db.Yf.ToString();
+            Yg.Text = db.Yg.ToString();
+            Yh.Text = db.Yh.ToString();
+            Yi.Text = db.Yi.ToString();
+            Yj.Text = db.Yj.ToString();
+            Yk.Text = db.Yk.ToString();
+            Yl.Text = db.Yl.ToString();
+            Ym.Text = db.Ym.ToString();
+            Yn.Text = db.Yn.ToString();
+            Yo.Text = db.Yo.ToString();
 
 
         }
diff --git a/DataBlockHelper/DBHelpers/Db2101Helper.cs b/DataBlockHelper/DBHelpers/Db2101Helper.cs
index e6e4a73..505bfff 100644
--- a/DataBlockHelper/DBHelpers/Db2101Helper.cs
+++ b/DataBlockHelper/DBHelpers/Db2101Helper.cs
@@ -15,7 +15,7 @@ namespace DataBlockHelper.DBHelpers
       
         public Db2101Helper() 
         {
-            OperateResult<byte[]> db = PlcConnect.Instance.Read("DB2101.0.0", 154);
+            OperateResult<byte[]> db = PlcConnect.Instance.Read("DB2101.0.0", 216);
             bytes = db.Content;
         }
 
@@ -47,26 +47,26 @@ namespace DataBlockHelper.DBHelpers
 
         public Db2101LinEntity LinC => new Db2101LinEntity(144, bytes);
 
-       
-        //public short Ya => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 186);
-        //public short Yb => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 188);
-        //public short Yc => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 190);
-        //public short Yd => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 192);
-        //public short Ye => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 194);
-        //public short Yf => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 196);
 
-        //public short Yg => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 198);
-        //public short Yh => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 200);
-        //public short Yi => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 202);
+        public short Ya => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 186);
+        public short Yb => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 188);
+        public short Yc => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 190);
+        public short Yd => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 192);
+        public short Ye => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 194);
+        public short Yf => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 196);
 
-        //public short Yj => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 204);
-        //public short Yk => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 206);
-        //public short Yl => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 208);
-        //public short Ym => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 210);
+        public short Yg => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 198);
+        public short Yh => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 200);
+        public short Yi => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 202);
 
-        //public short Yn => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 212);
+        public short Yj => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 204);
+        public short Yk => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 206);
+        public short Yl => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 208);
+        public short Ym => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 210);
 
-        //public short Yo => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 214);
+        public short Yn => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 212);
+
+        public short Yo => PlcConnect.Instance.ByteTransform.TransInt16(bytes, 214);
 
     }
 
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml
index 5a60076..905426a 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDanQi.xml
@@ -1479,7 +1479,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">903, 780</Property>
+    <Property name="Size">634, 780</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">氮气设置</Property>
     <Property name="WindowState">Normal</Property>