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

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs

@@ -79,6 +79,11 @@ namespace Mesnac.Action.ChemicalWeighing.Test
 
         private void MCButton_Click(object sender, EventArgs e)
         {
+
+           var list= MReadHelp.Read();
+
+            new DB137Helper();
+
             DB120WriteHelp.AddABCDEF(new Uhd()
             {
                 A = 60,

DataBlockHelper/DBHelpers/DB137Helper.cs

@@ -0,0 +1,50 @@
+using HslCommunication;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataBlockHelper.DBHelpers
+{
+    public class DB137Helper : DBHelper
+    {
+
+        public DB137Helper() {
+            OperateResult<byte[]> db = PlcConnect.Instance.Read("DB137.0.0", 14);
+            bytes = db.Content;
+            var trans = PlcConnect.Instance.ByteTransform;
+            var tyb = bytes.Skip(0).Take(1).First();
+            HighLevel01 = tyb.GetBit(0);
+            HighLevel02 = tyb.GetBit(1);
+            HighLevel03 = tyb.GetBit(2);
+
+            Excitation01 = tyb.GetBit(3);
+            Excitation02 = tyb.GetBit(4);
+            Excitation03= tyb.GetBit(5);
+
+            SideBlowing01=tyb.GetBit(6);
+            SideBlowing02=tyb.GetBit(7);
+
+            tyb = bytes.Skip(1).Take(1).First();
+            SideBlowing03 = tyb.GetBit(0);
+        }
+
+
+        public bool HighLevel01 { get; set; }
+        public bool HighLevel02 { get; set; }
+        public bool HighLevel03 { get; set; }
+
+        public bool Excitation01 { get; set; }
+        public bool Excitation02 { get; set; }
+        public bool Excitation03 { get; set; }
+
+
+        public bool SideBlowing01 { get; set; }
+
+        public bool SideBlowing02 { get; set; }
+
+        public bool SideBlowing03 { get; set; }
+    }
+}

DataBlockHelper/DBHelpers/MReadHelp.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataBlockHelper.DBHelpers
+{
+    public class MReadHelp
+    {
+       
+
+
+        public  static List<bool> Read()
+        {
+            var p= PlcConnect.Instance;
+            string m = "M1003.4";
+            List<bool> result = new List<bool>();
+            result.Add(p.ReadBool("M1003.4").Content);
+            result.Add(p.ReadBool("M1004.4").Content);
+
+            result.Add(p.ReadBool("M1006.4").Content);
+            result.Add(p.ReadBool("M1007.4").Content);
+
+
+            result.Add(p.ReadBool("M1009.4").Content);
+            result.Add(p.ReadBool("M1010.4").Content);
+
+            return result;
+        }
+        
+    
+    }
+}

DataBlockHelper/DataBlockHelper.csproj

@@ -52,6 +52,7 @@
     <Compile Include="DBHelpers\DB112WriterHelper.cs" />
     <Compile Include="DBHelpers\DB120Help.cs" />
     <Compile Include="DBHelpers\DB120WriteHelp.cs" />
+    <Compile Include="DBHelpers\DB137Helper.cs" />
     <Compile Include="DBHelpers\DB1Helper.cs" />
     <Compile Include="DBHelpers\DB2102Helper.cs" />
     <Compile Include="DBHelpers\DB2103Helper.cs" />
@@ -72,6 +73,7 @@
     <Compile Include="DBHelpers\DB92Help.cs" />
     <Compile Include="DBHelpers\DB92WriterHelp.cs" />
     <Compile Include="DBHelpers\DBHelper.cs" />
+    <Compile Include="DBHelpers\MReadHelp.cs" />
     <Compile Include="DbWrite\PlcWriteUtil.cs" />
     <Compile Include="Entity\ClickEntity.cs" />
     <Compile Include="Entity\DB1Entity\ForAnaLogIn.cs" />

Main/MCEdit/Data/MCProject/nodeForm/DeliverPressureSetting.xml

@@ -38,11 +38,11 @@
         <Property name="DbOptionType">None</Property>
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
-        <Property name="Text">压力下限</Property>
+        <Property name="Text">主气源压力下限</Property>
         <Property name="Font">宋体, 9pt</Property>
         <Property name="Location">18, 336</Property>
         <Property name="Name">MCLabel78</Property>
-        <Property name="Size">53, 12</Property>
+        <Property name="Size">89, 12</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="Upper" children="Controls">
         <Property name="KeyDownActionList">
@@ -81,11 +81,11 @@
         <Property name="DbOptionType">None</Property>
         <Property name="MCVisible">True</Property>
         <Property name="MCEnabled">True</Property>
-        <Property name="Text">压力上限</Property>
+        <Property name="Text">主气源压力上限</Property>
         <Property name="Font">宋体, 9pt</Property>
         <Property name="Location">18, 296</Property>
         <Property name="Name">MCLabel79</Property>
-        <Property name="Size">53, 12</Property>
+        <Property name="Size">89, 12</Property>
       </Object>
       <Object type="Mesnac.Controls.Default.MCTextBox, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="AuxC" children="Controls">
         <Property name="KeyDownActionList">
@@ -396,7 +396,7 @@
         <Property name="Size">95, 12</Property>
       </Object>
       <Property name="TabStop">False</Property>
-      <Property name="Text">输送钱压力设置</Property>
+      <Property name="Text">输送线压力设置</Property>
       <Property name="Font">宋体, 12pt</Property>
       <Property name="Location">420, 343</Property>
       <Property name="Name">GroupBox6</Property>