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,9 +79,52 @@ namespace Mesnac.Action.ChemicalWeighing.Test
 
         private void MCButton_Click(object sender, EventArgs e)
         {
-             ReportReadDb.ReadFeededDry();
+            DB120WriteHelp.AddABCDEF(new Uhd()
-
+            {
-          var list=  DB2105WriteHelper.GetWaterStatus();
+                A = 60,
+                B = 60,
+                C = 60,
+                D = 60,
+                E = 60,
+                F = 60,
+                G = 60,
+                H = 60,
+                I = 60,
+                J = 60,
+                K = 60,
+                L = 60,
+                M = 60,
+                N = 60,
+                O = 60,
+                Delay1 = 3,
+                Delay2 = 2,
+                Delay3 = 1
+
+            });
+
+            DB120Help help1 = new DB120Help();
+            var user = help1.GetUhd;
+
+
+
+
+            DB92WriterHelp.Add(new Pipe()
+            {
+                MainPipieA = 0.4f,
+                AuxPipieA = 0.4f,
+
+                MainPipieB = 0.4f,
+                AuxPipieB = 0.4f,
+
+                MainPipieC = 0.4f,
+                AuxPipieC = 0.4f,
+
+                UpperPressure = 0.6f,
+                LowerPressure = 0.3f,
+            });
+
+            DB92Help help = new DB92Help();
+            var pipe= help.GetPipe;
         }
     }
 }

DataBlockHelper/DBHelpers/DB120Help.cs

@@ -13,12 +13,12 @@ namespace DataBlockHelper.DBHelpers
 
         public DB120Help() {
             
-            OperateResult<byte[]> db120 = PlcConnect.Instance.Read("DB120.0.0", 64);
+            OperateResult<byte[]> db120 = PlcConnect.Instance.Read("DB120.0.0", 66);
             bytes = db120.Content;
         }
 
 
-        public Uhd GetUhd => new Uhd();
+        public Uhd GetUhd => new Uhd(bytes);
        
 
     }

DataBlockHelper/DBHelpers/DB120WriteHelp.cs

@@ -15,7 +15,7 @@ namespace DataBlockHelper.DBHelpers
         {
             int start = 0;
             var siemensS7Net = PlcConnect.Instance;
-            siemensS7Net.Write($"{DbName}.{start}.0", uhd.A);
+            var sss=siemensS7Net.Write($"{DbName}.{start}.0", uhd.A);
             siemensS7Net.Write($"{DbName}.{start + 4}.0", uhd.B);
             siemensS7Net.Write($"{DbName}.{start + 8}.0", uhd.C);
             siemensS7Net.Write($"{DbName}.{start + 12}.0", uhd.D);

DataBlockHelper/DBHelpers/DB92Help.cs

@@ -15,6 +15,9 @@ namespace DataBlockHelper.DBHelpers
             OperateResult<byte[]> db = PlcConnect.Instance.Read("DB92.0.0", 34);
             bytes = db.Content;
         }
+
+
+        public Pipe GetPipe => new Pipe(2, bytes);
     }