Merge branch 'dep' into dep_pf

# Conflicts:
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ChemicalWeighingPlc/PlcPlanHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/FinishBatchHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FinishBatch/SaveHelper/ReportGelDoserHelper.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/LjFormulaDetailDownEntity.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.Designer.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/FormClientManager.resx
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjClick/InitFormAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMetage/MetageHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownToDatabase.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/PauseAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjWeight/WeightSettingPlc.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Pl/PlcConnect.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Product/PptPlan/AutoDownloadAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Sys/TimerRunService.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/DeleteAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/FrmRecipe.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/ModifyRecipeAction.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SelectRecipe.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParam.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Technical/PmtRecipe/SetCratParamForm.cs
#	Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
#	DataBlockHelper/DataBlockHelper.csproj
#	DataBlockHelper/Entity/ClickEntity.cs
#	DataBlockHelper/PlcConnect.cs
#	Main/MCEdit/Data/MCProject/SCWSProject2.mprj
#	Main/MCEdit/Data/MCProject/nodeForm/Form1.xml

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

@@ -36,8 +36,6 @@ namespace Mesnac.Action.ChemicalWeighing.Test
         public void timer1EventProcessor(object source, EventArgs e)
         {
 
-
-
             DB2105Helper db2105Helper = new DB2105Helper();
             var lis = db2105Helper.ReadReadyG1;
             lis = db2105Helper.ReadReadyG2;
@@ -47,14 +45,14 @@ namespace Mesnac.Action.ChemicalWeighing.Test
             lis = db2105Helper.ReadReadyG6;
             lis = db2105Helper.ReadReadyG7;
             lis = db2105Helper.ReadReadyG8;
-           var  liss = db2105Helper.ReadReadyM1;
+            var  liss = db2105Helper.ReadReadyM1;
-           liss = db2105Helper.ReadReadyM2;
+            liss = db2105Helper.ReadReadyM2;
-           liss = db2105Helper.ReadReadyM3;
+            liss = db2105Helper.ReadReadyM3;
-           liss = db2105Helper.ReadReadyM4;
+            liss = db2105Helper.ReadReadyM4;
-           liss = db2105Helper.ReadReadyM5;
+            liss = db2105Helper.ReadReadyM5;
-           liss = db2105Helper.ReadReadyM6;
+            liss = db2105Helper.ReadReadyM6;
-           liss = db2105Helper.ReadReadyM7;
+            liss = db2105Helper.ReadReadyM7;
-           liss = db2105Helper.ReadReadyM8;
+            liss = db2105Helper.ReadReadyM8;
 
 
             var yw= Db3000Helper.ReadModel();