diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs index cdfb233..9a058ce 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs @@ -23,14 +23,14 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static DryerView GetGelatG7 => GetGelatView(1858); public static DryerView GetGelatG8 => GetGelatView(1998); - public static List GetWeterM1 = GetWeterView(2138); - public static List GetWeterM2 = GetWeterView(2338); - public static List GetWeterM3 = GetWeterView(2538); - public static List GetWeterM4 = GetWeterView(2738); - public static List GetWeterM5 = GetWeterView(2938); - public static List GetWeterM6 = GetWeterView(3138); - public static List GetWeterM7 = GetWeterView(3338); - public static List GetWeterM8 = GetWeterView(3538); + public static List GetWeterM1 => GetWeterView(2138); + public static List GetWeterM2 => GetWeterView(2338); + public static List GetWeterM3 => GetWeterView(2538); + public static List GetWeterM4 => GetWeterView(2738); + public static List GetWeterM5 => GetWeterView(2938); + public static List GetWeterM6 => GetWeterView(3138); + public static List GetWeterM7 => GetWeterView(3338); + public static List GetWeterM8 => GetWeterView(3538); /// /// 干混机1 @@ -41,7 +41,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin = 58; - DownCleanD1Recipe(begin); + //DownCleanD1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -69,7 +69,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin = 298; - DownCleanD1Recipe(begin); + //DownCleanD1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -96,7 +96,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin = 538; - DownCleanD1Recipe(begin); + //DownCleanD1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -120,7 +120,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownD4Recipe(List recipePlcViews, List recipeSteps) { int begin = 778; - DownCleanD1Recipe(begin); + //DownCleanD1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -149,7 +149,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin = 1018; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -173,7 +173,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownG2Recipe(List recipePlcViews, List recipeSteps) { int begin = 1158; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -199,7 +199,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownG3Recipe(List recipePlcViews, List recipeSteps) { int begin = 1298; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -224,7 +224,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownG4Recipe(List recipePlcViews, List recipeSteps) { int begin = 1438; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -250,7 +250,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownG5Recipe(List recipePlcViews, List recipeSteps) { int begin = 1578; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -276,7 +276,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin =1718; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -303,7 +303,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin =1858; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -330,7 +330,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning int begin =1998; - DownCleanG1Recipe(begin); + //DownCleanG1Recipe(begin); for (int i = 0; i < recipePlcViews.Count(); i++) { var view = recipePlcViews[i]; @@ -355,7 +355,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning { int begin = 2138; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -373,7 +373,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM2Recipe(List recipeSteps) { int begin = 2338; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -387,7 +387,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM3Recipe(List recipeSteps) { int begin = 2538; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -401,7 +401,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM4Recipe(List recipeSteps) { int begin = 2738; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -415,7 +415,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM5Recipe(List recipeSteps) { int begin = 2938; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -429,7 +429,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM6Recipe(List recipeSteps) { int begin = 2978; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -442,7 +442,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM7Recipe(List recipeSteps) { int begin = 3138; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -455,7 +455,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static void DownM8Recipe(List recipeSteps) { int begin = 3338; - DownM1CleanRecipe(begin); + //DownM1CleanRecipe(begin); for (int i = 0; i < recipeSteps.Count(); i++) { var view = recipeSteps[i]; @@ -570,7 +570,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private static List GetWeterView(int start) { var byteTransform = PlcConnect.Instance.ByteTransform; - List ls = new List(); var operateResult = PlcConnect.Instance.Read($"DB2104.{start}.0", 200); List lsSteps = new List(); if (operateResult.IsSuccess) @@ -600,67 +599,67 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning return lsSteps; } - private static void DownCleanD1Recipe(int begin) - { - List recipePlcViews = GetClean(12); - List recipeSteps = GetCleanStep(10); - - for (int i = 0; i < recipePlcViews.Count(); i++) - { - var view = recipePlcViews[i]; - Dowd(begin, view); - begin += 10; - } - - begin += 120; - for (int i = 0; i < recipeSteps.Count(); i++) - { - var view = recipeSteps[i]; - DowSteps(begin, view); - begin += 12; - - } - - } - - private static void DownCleanG1Recipe(int begin) - { - List recipePlcViews = GetClean(2); - List recipeSteps = GetCleanStep(10); - - for (int i = 0; i < recipePlcViews.Count(); i++) - { - var view = recipePlcViews[i]; - Dowd(begin, view); - begin += 10; - } - - begin += 20; - for (int i = 0; i < recipeSteps.Count(); i++) - { - var view = recipeSteps[i]; - DowSteps(begin, view); - begin += 12; - - } - - } - - - private static void DownM1CleanRecipe(int begin) - { - - List recipeSteps = GetCleanMixStep(10); - - for (int i = 0; i < recipeSteps.Count(); i++) - { - var view = recipeSteps[i]; - DowMSteps(begin, view); - begin += 20; - - } - - } + // private static void DownCleanD1Recipe(int begin) + // { + // List recipePlcViews = GetClean(12); + // List recipeSteps = GetCleanStep(10); + // + // for (int i = 0; i < recipePlcViews.Count(); i++) + // { + // var view = recipePlcViews[i]; + // Dowd(begin, view); + // begin += 10; + // } + // + // begin += 120; + // for (int i = 0; i < recipeSteps.Count(); i++) + // { + // var view = recipeSteps[i]; + // DowSteps(begin, view); + // begin += 12; + // + // } + // + // } + + // private static void DownCleanG1Recipe(int begin) + // { + // List recipePlcViews = GetClean(2); + // List recipeSteps = GetCleanStep(10); + // + // for (int i = 0; i < recipePlcViews.Count(); i++) + // { + // var view = recipePlcViews[i]; + // Dowd(begin, view); + // begin += 10; + // } + // + // begin += 20; + // for (int i = 0; i < recipeSteps.Count(); i++) + // { + // var view = recipeSteps[i]; + // DowSteps(begin, view); + // begin += 12; + // + // } + // + // } + + + // private static void DownM1CleanRecipe(int begin) + // { + // + // List recipeSteps = GetCleanMixStep(10); + // + // for (int i = 0; i < recipeSteps.Count(); i++) + // { + // var view = recipeSteps[i]; + // DowMSteps(begin, view); + // begin += 20; + // + // } + // + // } private static void Dowd(int start, RecipePlcView view) @@ -692,7 +691,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning private static void DowMSteps(int start, MixStep step) { int mixCode = start; - PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode); + var s= PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode); int mixTime = start + 2; PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime);