merge

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs

@@ -28,7 +28,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             McControls = GetAllControls();
 
             ControlImport();
-
+           
+            
 
             BottomSelect(runtime);
         }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs

@@ -271,7 +271,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjMixManager
                 {
                     Bin = Convert.ToUInt16(dataTableRow["Code"]),
                     Set = Convert.ToSingle(dataTableRow["Weight"]),
-                    TolErance = Convert.ToSingle(dataTableRow["Weight"])
+                    Tolerance = Convert.ToSingle(dataTableRow["Weight"])
                 };
                 
                 list.Add(view);

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs

@@ -521,7 +521,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
             {
                 Bin = x.BinNo,
                 Set = x.Weight,
-                TolErance = x.Tolerance
+                Tolerance = x.Tolerance
             }).ToList();
 
             unitView.H1 = dataDry1CPlcView;
@@ -553,7 +553,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
             {
                 Bin = x.BinNo,
                 Set = x.Weight,
-                TolErance = x.Tolerance
+                Tolerance = x.Tolerance
             }).ToList();
 
             unitView.H1 = dataSilo1CPlcView;
@@ -564,7 +564,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
             {
                 Bin = x.BinNo,
                 Set = x.Weight,
-                TolErance = x.Tolerance
+                Tolerance = x.Tolerance
             }).ToList();
 
             unitView.H2 = dataSilo1CWaterPlcView;
@@ -601,7 +601,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
             {
                 Bin = x.BinNo,
                 Set = x.Weight,
-                TolErance = x.Tolerance
+                Tolerance = x.Tolerance
             }).ToList();
 
             unitView.H1 = dataSilo2CPlcView;
@@ -637,7 +637,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
                 {
                     Bin = 0,
                     Set = 0,
-                    TolErance = 0
+                    Tolerance = 0
                 });
             }
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs

@@ -491,7 +491,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
                     {
                         Bin = byteTransform.TransUInt16(bytes, 0),
                         Set = byteTransform.TransSingle(bytes, 2),
-                        TolErance = byteTransform.TransSingle(bytes, 6)
+                        Tolerance = byteTransform.TransSingle(bytes, 6)
                     };
                     ls.Add(plcView);
                 }
@@ -539,7 +539,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
                     {
                         Bin = byteTransform.TransUInt16(bytes, 0),
                         Set = byteTransform.TransSingle(bytes, 2),
-                        TolErance = byteTransform.TransSingle(bytes, 6)
+                        Tolerance = byteTransform.TransSingle(bytes, 6)
                     };
                     ls.Add(plcView);
                 }
@@ -674,7 +674,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
             int set = start + 2;
             PlcConnect.Instance.Write($"DB2104.{set}.0", view.Set);
             int tolerance = start + 6;
-            PlcConnect.Instance.Write($"DB2104.{tolerance}.0", view.TolErance);
+            PlcConnect.Instance.Write($"DB2104.{tolerance}.0", view.Tolerance);
 
         }
 
@@ -724,7 +724,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
                 ls.Add(new RecipePlcView()
                 {
                     Bin = 0,
-                    TolErance = 0,
+                    Tolerance = 0,
                     Set = 0
                 });
 

DataBlockHelper/DBHelpers/DB2104Helper.cs

@@ -87,7 +87,7 @@ namespace DataBlockHelper.DBHelpers
             {
                 Bin = instanceByteTransform.TransInt16(ls, 0),
                 Set = instanceByteTransform.TransSingle(ls, 2),
-                TolErance = instanceByteTransform.TransSingle(ls, 6)
+                Tolerance = instanceByteTransform.TransSingle(ls, 6)
             };
             return entity;
         }

DataBlockHelper/DBHelpers/DB2104WriteHelper.cs

@@ -62,7 +62,7 @@ namespace DataBlockHelper.DBHelpers
             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+6}.0", entity.Tolerance);
         }
     }
 }