Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs

@@ -284,8 +284,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
             SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple4, mixSingle[3]);
             SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple5, mixSingle[4]);
             SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple6, mixSingle[5]);
-            SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple7, false);
+            SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple7, mixSingle[6]);
-            SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple8, false);
+            SetHslLanternSimple(HslLanternSimpleE.HslLanternSimple8, mixSingle[7]);
 
 
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs

@@ -24,6 +24,7 @@ using Mesnac.Core.Service;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -410,9 +411,13 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
             Time(6, mixok6 ? 1 : 0);
 
             bool mixok7 = PlcConnect.Instance.ReadBool("DB3000.0.6").Content;
+
+            Trace.WriteLine("7号信号:" + mixok7);
+
             Time(7, mixok7 ? 1 : 0);
 
             bool mixok8 = PlcConnect.Instance.ReadBool("DB3000.0.7").Content;
+            Trace.WriteLine("8号信号:" + mixok8);
             Time(8, mixok8 ? 1 : 0);
 
         }

DataBlockHelper/DBHelpers/Db3000Helper.cs

@@ -13,7 +13,7 @@ namespace DataBlockHelper.DBHelpers
             {
                 var context = operateResult.Content;
 
-                for (var i = 0; i < 6; i++)
+                for (var i = 0; i < 8; i++)
                 {
                     var bo = context.GetBoolByIndex(i);
                     ls.Add(bo);
@@ -21,7 +21,7 @@ namespace DataBlockHelper.DBHelpers
             }
             else
             {
-                for (var i = 0; i < 6; i++)
+                for (var i = 0; i < 8; i++)
                 {
                     ls.Add(false);
                 }