From d99ff59e3eea188f5160167a1aa8ce0f0d37f61d 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 09:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81=E6=B7=BB=E5=8A=A0=E9=AB=98?=
 =?UTF-8?q?=E4=BD=8E=E6=96=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjDeliver/DeliverInitAction.cs                   | 12 ++++++------
 DataBlockHelper/DBHelpers/DB139Helper.cs             | 10 +++++++++-
 Main/MCEdit/Data/MCProject/nodeDataSource.xml        |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
index 2f33d44..6b6b737 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjDeliver/DeliverInitAction.cs
@@ -224,7 +224,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsImprot.SetSwitchLight(SwitchlightE.LSiloK, list[10]);
             ControlsImprot.SetSwitchLight(SwitchlightE.LSiloL, list[11]);
             ControlsImprot.SetSwitchLight(SwitchlightE.LSiloM, list[12]);
-            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloM, list[13]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloN, list[13]);
             ControlsImprot.SetSwitchLight(SwitchlightE.LSiloO, list[14]);
 
 
@@ -243,11 +243,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjDeliver
             ControlsImprot.SetSwitchLight(SwitchlightE.HSiloI, list[8]);
             ControlsImprot.SetSwitchLight(SwitchlightE.HSiloJ, list[9]);
 
-            //ControlsImprot.SetSwitchLight(SwitchlightE.LSiloK, list[10]);
-            //ControlsImprot.SetSwitchLight(SwitchlightE.LSiloL, list[11]);
-            //ControlsImprot.SetSwitchLight(SwitchlightE.LSiloM, list[12]);
-            //ControlsImprot.SetSwitchLight(SwitchlightE.LSiloM, list[13]);
-            ControlsImprot.SetSwitchLight(SwitchlightE.HSiloO, list[10]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloK, list[10]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloL, list[11]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloM, list[12]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.LSiloN, list[13]);
+            ControlsImprot.SetSwitchLight(SwitchlightE.HSiloO, list[14]);
 
 
         }
diff --git a/DataBlockHelper/DBHelpers/DB139Helper.cs b/DataBlockHelper/DBHelpers/DB139Helper.cs
index 7038e4c..2469195 100644
--- a/DataBlockHelper/DBHelpers/DB139Helper.cs
+++ b/DataBlockHelper/DBHelpers/DB139Helper.cs
@@ -72,8 +72,16 @@ namespace DataBlockHelper.DBHelpers
                 result.Add(con.GetBit(0));
                 result.Add(con.GetBit(1));
                 result.Add(con.GetBit(2));
-                
 
+
+                db = PlcConnect.Instance.Read("M1202.0", 1);
+                content = db.Content.ToArray();
+                con = content[0];
+
+                result.Add(con.GetBit(0));
+                result.Add(con.GetBit(1));
+                result.Add(con.GetBit(2));
+                result.Add(con.GetBit(3));
                 return result;
             }
         }
diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml
index 3600a0d..387be9b 100644
--- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml
+++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml
@@ -1,3 +1,3 @@
 <DataSources>
-  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
+  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="172.18.4.111" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
 </DataSources>
\ No newline at end of file