From dee332a98fbcd54f14732d718a34af5f66b6a2e2 Mon Sep 17 00:00:00 2001
From: wangsr <gxhsoulstar@163.com>
Date: Fri, 27 Oct 2023 09:54:35 +0800
Subject: [PATCH] =?UTF-8?q?debug=20-=20=E8=87=AA=E5=8A=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoControl/GelerWeterControl.cs          | 28 ++++++++--
 .../DBHelpers/DB2104WriteHelper.cs            |  6 +--
 .../DBHelpers/DB2105WriteHelper.cs            | 52 +++++++++----------
 .../Data/MCProject/nodeForm/AutoControlC.xml  | 26 +++++-----
 4 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
index fb58eb6..0a2b6a7 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
@@ -285,6 +285,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 {
                     MessageBox.Show("信号未准备好！");
                 }
+                else
+                {
+                    MessageBox.Show("信号下达成功！");
+                }
             }
 
             if (ControlsEntity.GelManualColdWater == runtime.Sender)
@@ -331,6 +335,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 {
                     MessageBox.Show("信号未准备好！");
                 }
+                else
+                {
+                    MessageBox.Show("信号下达成功！");
+                }
 
             }
 
@@ -379,6 +387,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 {
                     MessageBox.Show("信号未准备好！");
                 }
+                else
+                {
+                    MessageBox.Show("信号下达成功！");
+                }
             }
 
             if (ControlsEntity.WetManualGel == runtime.Sender)
@@ -426,6 +438,10 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 {
                     MessageBox.Show("信号未准备好！");
                 }
+                else
+                {
+                    MessageBox.Show("信号下达成功！");
+                }
             }
 
             if (ControlsEntity.WetManualControl == runtime.Sender)
@@ -434,10 +450,11 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                 {
                     return;
                 }
+
                 SetValue value = new SetValue()
                 {
-                    Value = Convert.ToSingle(ControlsEntity.ManualTolerance.MCValue.ToString()),
-                    Toterance = Convert.ToSingle(ControlsEntity.ManualWeight.MCValue.ToString())
+                    Value = Convert.ToSingle(ControlsEntity.ManualWeight.MCValue.ToString()),
+                    Toterance = Convert.ToSingle(ControlsEntity.ManualTolerance.MCValue.ToString())
                 };
 
                 switch (SingleSelect())
@@ -478,6 +495,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                         MessageBox.Show("当前未选择产线！");
                         return;
                 }
+
+                MessageBox.Show("数据下传成功！");
+
             }
 
             #endregion
@@ -521,6 +541,9 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                         MessageBox.Show("请选择一条产线！");
                         return;
                 }
+
+                MessageBox.Show("产线已启动！");
+
             }
 
             if (ControlsEntity.LineStop == runtime.Sender)
@@ -658,7 +681,6 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
         private IBaseControl GetBaseControl(string name)
         {
-
             return McControls.First(x => x.Name == name) as IBaseControl;
         }
 
diff --git a/DataBlockHelper/DBHelpers/DB2104WriteHelper.cs b/DataBlockHelper/DBHelpers/DB2104WriteHelper.cs
index 3ec31d0..976be37 100644
--- a/DataBlockHelper/DBHelpers/DB2104WriteHelper.cs
+++ b/DataBlockHelper/DBHelpers/DB2104WriteHelper.cs
@@ -60,9 +60,9 @@ namespace DataBlockHelper.DBHelpers
         private static void Write(int start, WaterEntity entity)
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:{start}.0", entity.Bin);
-            siemensS7Net.Write($"{DbName}:{start+2}.0", entity.Set);
-            siemensS7Net.Write($"{DbName}:{start+6}.0", entity.Tolerance);
+            siemensS7Net.Write($"{DbName}.{start}.0", entity.Bin);
+            siemensS7Net.Write($"{DbName}.{start+2}.0", entity.Set);
+            siemensS7Net.Write($"{DbName}.{start+6}.0", entity.Tolerance);
         }
     }
 }
\ No newline at end of file
diff --git a/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs b/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
index e84b04b..ea72442 100644
--- a/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
+++ b/DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
@@ -12,146 +12,146 @@ namespace DataBlockHelper.DBHelpers
         public static void WriteStartJob1()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.0",true);
+            siemensS7Net.Write($"{DbName}.52.0",true);
         }
         public static void WriteStopJob1()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.0",false);
+            siemensS7Net.Write($"{DbName}.52.0",false);
         }
         
         public static void WriteStartJob2()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.1",true);
+            siemensS7Net.Write($"{DbName}.52.1",true);
         }
         
         public static void WriteStopJob2()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.1",false);
+            siemensS7Net.Write($"{DbName}.52.1",false);
         }
         
         public static void WriteStartJob3()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.2",true);
+            siemensS7Net.Write($"{DbName}.52.2",true);
         }
         
         
         public static void WriteStopJob3()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.2",false);
+            siemensS7Net.Write($"{DbName}.52.2",false);
         }
         
         public static void WriteStartJob4()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.3",true);
+            siemensS7Net.Write($"{DbName}.52.3",true);
         }
         
         public static void WriteStopJob4()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.3",false);
+            siemensS7Net.Write($"{DbName}.52.3",false);
         }
         
         public static void WriteStartJob5()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.4",true);
+            siemensS7Net.Write($"{DbName}.52.4",true);
         }
         
         public static void WriteStopJob5()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.4",false);
+            siemensS7Net.Write($"{DbName}.52.4",false);
         }
         
         public static void WriteStartJob6()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.5",true);
+            siemensS7Net.Write($"{DbName}.52.5",true);
         }
         
         public static void WriteStopJob6()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.5",false);
+            siemensS7Net.Write($"{DbName}.52.5",false);
         }
         
         public static void WriteStartJob7()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.6",true);
+            siemensS7Net.Write($"{DbName}.52.6",true);
         }
         
         public static void WriteStopJob7()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.6",false);
+            siemensS7Net.Write($"{DbName}.52.6",false);
         }
         
         public static void WriteStartJob8()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.7",true);
+            siemensS7Net.Write($"{DbName}.52.7",true);
         }
         
         public static void WriteStopJob8()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:52.7",false);
+            siemensS7Net.Write($"{DbName}.52.7",false);
         }
         
 
         public static void WriteManScrewH1()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.0",true);
+            siemensS7Net.Write($"{DbName}.53.0",true);
         }
         
         public static void WriteManScrewH2()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.1",true);
+            siemensS7Net.Write($"{DbName}.53.1",true);
         }
         
         public static void WriteManScrewH3()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.2",true);
+            siemensS7Net.Write($"{DbName}.53.2",true);
         }
         
         public static void WriteManScrewH4()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.3",true);
+            siemensS7Net.Write($"{DbName}.53.3",true);
         }
         
         public static void WriteManScrewH5()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.4",true);
+            siemensS7Net.Write($"{DbName}.53.4",true);
         }
         
         public static void WriteManScrewH6()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.5",true);
+            siemensS7Net.Write($"{DbName}.53.5",true);
         }
         
         public static void WriteManScrewH7()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.6",true);
+            siemensS7Net.Write($"{DbName}.53.6",true);
         }
         
         public static void WriteManScrewH8()
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:53.7",true);
+            siemensS7Net.Write($"{DbName}.53.7",true);
         }
 
         public static void WriteSetValueH1(SetValue setValue)
@@ -179,8 +179,8 @@ namespace DataBlockHelper.DBHelpers
         private static void WriteSetValue(int start,SetValue setValue)
         {
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}:{start}.0", setValue.Value);
-            siemensS7Net.Write($"{DbName}:{start+4}.0", setValue.Toterance);
+            siemensS7Net.Write($"{DbName}.{start}.0", setValue.Value);
+            siemensS7Net.Write($"{DbName}.{start+4}.0", setValue.Toterance);
             
         }
 
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
index 0a2f04f..d7e7def 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/AutoControlC.xml
@@ -70,7 +70,7 @@
       <Property name="OldFillColor">DarkGray</Property>
       <Property name="Text">下传</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">733, 79</Property>
+      <Property name="Location">733, 94</Property>
       <Property name="Name">Download</Property>
       <Property name="Size">168, 56</Property>
       <Property name="TabIndex">8</Property>
@@ -249,7 +249,7 @@
       <Property name="Font">宋体, 12pt</Property>
       <Property name="Location">12, 12</Property>
       <Property name="Name">GroupBox34</Property>
-      <Property name="Size">889, 61</Property>
+      <Property name="Size">889, 65</Property>
       <Property name="TabIndex">10</Property>
     </Object>
     <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox1" children="Controls">
@@ -394,9 +394,9 @@
           <Property name="TabStop">False</Property>
           <Property name="Text">手动控制</Property>
           <Property name="Font">宋体, 9pt</Property>
-          <Property name="Location">8, 266</Property>
+          <Property name="Location">6, 266</Property>
           <Property name="Name">GroupBox48</Property>
-          <Property name="Size">188, 174</Property>
+          <Property name="Size">190, 174</Property>
           <Property name="TabIndex">8</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox46" children="Controls">
@@ -446,9 +446,9 @@
           <Property name="TabStop">False</Property>
           <Property name="Text">5-时间设定</Property>
           <Property name="Font">宋体, 9pt</Property>
-          <Property name="Location">8, 204</Property>
+          <Property name="Location">6, 204</Property>
           <Property name="Name">GroupBox46</Property>
-          <Property name="Size">188, 56</Property>
+          <Property name="Size">190, 56</Property>
           <Property name="TabIndex">7</Property>
         </Object>
         <Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox45" children="Controls">
@@ -605,7 +605,7 @@
             <Property name="Font">宋体, 12pt</Property>
             <Property name="Location">6, 20</Property>
             <Property name="Name">GelManualPowder</Property>
-            <Property name="Size">110, 43</Property>
+            <Property name="Size">113, 43</Property>
             <Property name="TabIndex">43</Property>
           </Object>
           <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="GelManualHotWater" children="Controls">
@@ -630,7 +630,7 @@
             <Property name="Font">宋体, 12pt</Property>
             <Property name="Location">6, 183</Property>
             <Property name="Name">GelManualHotWater</Property>
-            <Property name="Size">110, 43</Property>
+            <Property name="Size">113, 43</Property>
             <Property name="TabIndex">45</Property>
           </Object>
           <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="GelManualColdWater" children="Controls">
@@ -655,7 +655,7 @@
             <Property name="Font">宋体, 12pt</Property>
             <Property name="Location">6, 100</Property>
             <Property name="Name">GelManualColdWater</Property>
-            <Property name="Size">110, 43</Property>
+            <Property name="Size">113, 43</Property>
             <Property name="TabIndex">44</Property>
           </Object>
           <Object type="Mesnac.Controls.Default.MCButton, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCButton2147483643" children="Controls">
@@ -686,9 +686,9 @@
           <Property name="TabStop">False</Property>
           <Property name="Text">手动控制</Property>
           <Property name="Font">宋体, 9pt</Property>
-          <Property name="Location">365, 207</Property>
+          <Property name="Location">365, 204</Property>
           <Property name="Name">GroupBox47</Property>
-          <Property name="Size">122, 232</Property>
+          <Property name="Size">125, 235</Property>
           <Property name="TabIndex">46</Property>
         </Object>
         <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MaterialTolerance2" children="Controls">
@@ -1384,7 +1384,7 @@
       <Property name="TabStop">False</Property>
       <Property name="Text">产线</Property>
       <Property name="Font">宋体, 12pt</Property>
-      <Property name="Location">12, 79</Property>
+      <Property name="Location">12, 83</Property>
       <Property name="Name">GroupBox1</Property>
       <Property name="Size">715, 478</Property>
       <Property name="TabIndex">9</Property>
@@ -1405,7 +1405,7 @@
     <Property name="MCPurview">False</Property>
     <Property name="AllowOriginalSizeShow">False</Property>
     <Property name="BackColor">Control</Property>
-    <Property name="Size">928, 607</Property>
+    <Property name="Size">928, 610</Property>
     <Property name="StartPosition">WindowsDefaultLocation</Property>
     <Property name="Text">湿混糊化自动参数控制</Property>
     <Property name="WindowState">Normal</Property>