yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
wangsr
wangsr 1 year ago
parent f96ab5dfec a594bc6510
commit 020548a811
3 changed files with 98 additions and 90 deletions
Show Stats Download Patch File Download Diff File

1
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/GelerWeterControl.cs
Unescape Escape View File

@ -497,6 +497,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
DB2105WriteHelper.WriteManScrewH4(); DB2105WriteHelper.WriteManScrewH4();
DB2105WriteHelper.WriteSetValueH2(value); DB2105WriteHelper.WriteSetValueH2(value);
break; break;
case 5: case 5:
DB2105WriteHelper.WriteManScrewH5(); DB2105WriteHelper.WriteManScrewH5();
DB2105WriteHelper.WriteSetValueH3(value); DB2105WriteHelper.WriteSetValueH3(value);

186
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs
Unescape Escape View File

@ -38,10 +38,11 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
/// <param name="recipePlcViews"></param> /// <param name="recipePlcViews"></param>
/// <param name="recipeSteps"></param> /// <param name="recipeSteps"></param>
public static void DownD1Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownD1Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 58; int begin = 58;
//DownCleanD1Recipe(begin); DownCleanD1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -67,9 +68,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownD2Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownD2Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 298; int begin = 298;
//DownCleanD1Recipe(begin); DownCleanD1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -94,9 +95,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownD3Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownD3Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 538; int begin = 538;
//DownCleanD1Recipe(begin); DownCleanD1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -119,8 +120,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownD4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownD4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 778; int begin = 778;
//DownCleanD1Recipe(begin); DownCleanD1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -147,9 +149,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG1Recipe(List<RecipePlcView> recipePlcViews,List<Step> recipeSteps) public static void DownG1Recipe(List<RecipePlcView> recipePlcViews,List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1018; int begin = 1018;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -172,8 +174,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG2Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG2Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1158; int begin = 1158;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -198,8 +201,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
public static void DownG3Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG3Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1298; int begin = 1298;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -223,8 +227,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
public static void DownG4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG4Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1438; int begin = 1438;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -249,8 +254,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG5Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG5Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin = 1578; int begin = 1578;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -274,9 +280,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
public static void DownG6Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG6Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1718; int begin =1718;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -301,9 +307,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
} }
public static void DownG7Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG7Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1858; int begin =1858;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -328,9 +334,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownG8Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps) public static void DownG8Recipe(List<RecipePlcView> recipePlcViews, List<Step> recipeSteps)
{ {
recipePlcViews = recipePlcViews.Where(x => x.Bin != -1).ToList();
int begin =1998; int begin =1998;
//DownCleanG1Recipe(begin); DownCleanG1Recipe(begin);
for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
{ {
var view = recipePlcViews[i]; var view = recipePlcViews[i];
@ -355,7 +361,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
{ {
int begin = 2138; int begin = 2138;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -373,7 +379,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM2Recipe(List<MixStep> recipeSteps) public static void DownM2Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2338; int begin = 2338;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -387,7 +393,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM3Recipe(List<MixStep> recipeSteps) public static void DownM3Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2538; int begin = 2538;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -401,7 +407,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM4Recipe(List<MixStep> recipeSteps) public static void DownM4Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2738; int begin = 2738;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -415,7 +421,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM5Recipe(List<MixStep> recipeSteps) public static void DownM5Recipe(List<MixStep> recipeSteps)
{ {
int begin = 2938; int begin = 2938;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -429,7 +435,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM6Recipe(List<MixStep> recipeSteps) public static void DownM6Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3138; int begin = 3138;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -442,7 +448,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM7Recipe(List<MixStep> recipeSteps) public static void DownM7Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3338; int begin = 3338;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -455,7 +461,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static void DownM8Recipe(List<MixStep> recipeSteps) public static void DownM8Recipe(List<MixStep> recipeSteps)
{ {
int begin = 3538; int begin = 3538;
//DownM1CleanRecipe(begin); DownM1CleanRecipe(begin);
for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
{ {
var view = recipeSteps[i]; var view = recipeSteps[i];
@ -599,67 +605,67 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
return lsSteps; return lsSteps;
} }
// private static void DownCleanD1Recipe(int begin) private static void DownCleanD1Recipe(int begin)
// { {
// List<RecipePlcView> recipePlcViews = GetClean(12); List<RecipePlcView> recipePlcViews = GetClean(12);
// List<Step> recipeSteps = GetCleanStep(10); List<Step> recipeSteps = GetCleanStep(10);
//
// for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
// { {
// var view = recipePlcViews[i]; var view = recipePlcViews[i];
// Dowd(begin, view); Dowd(begin, view);
// begin += 10; begin += 10;
// } }
//
// begin += 120; begin += 120;
// for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
// { {
// var view = recipeSteps[i]; var view = recipeSteps[i];
// DowSteps(begin, view); DowSteps(begin, view);
// begin += 12; begin += 12;
//
// } }
//
// } }
// private static void DownCleanG1Recipe(int begin) private static void DownCleanG1Recipe(int begin)
// { {
// List<RecipePlcView> recipePlcViews = GetClean(2); List<RecipePlcView> recipePlcViews = GetClean(2);
// List<Step> recipeSteps = GetCleanStep(10); List<Step> recipeSteps = GetCleanStep(10);
//
// for (int i = 0; i < recipePlcViews.Count(); i++) for (int i = 0; i < recipePlcViews.Count(); i++)
// { {
// var view = recipePlcViews[i]; var view = recipePlcViews[i];
// Dowd(begin, view); Dowd(begin, view);
// begin += 10; begin += 10;
// } }
//
// begin += 20; begin += 20;
// for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
// { {
// var view = recipeSteps[i]; var view = recipeSteps[i];
// DowSteps(begin, view); DowSteps(begin, view);
// begin += 12; begin += 12;
//
// } }
//
// } }
// private static void DownM1CleanRecipe(int begin) private static void DownM1CleanRecipe(int begin)
// { {
//
// List<MixStep> recipeSteps = GetCleanMixStep(10); List<MixStep> recipeSteps = GetCleanMixStep(10);
//
// for (int i = 0; i < recipeSteps.Count(); i++) for (int i = 0; i < recipeSteps.Count(); i++)
// { {
// var view = recipeSteps[i]; var view = recipeSteps[i];
// DowMSteps(begin, view); DowMSteps(begin, view);
// begin += 20; begin += 20;
//
// } }
//
// } }
private static void Dowd(int start, RecipePlcView view) private static void Dowd(int start, RecipePlcView view)
@ -691,7 +697,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private static void DowMSteps(int start, MixStep step) private static void DowMSteps(int start, MixStep step)
{ {
int mixCode = start; int mixCode = start;
var s= PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode); var s= PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode);
int mixTime = start + 2; int mixTime = start + 2;
PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime); PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime);

1
DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
Unescape Escape View File

@ -203,6 +203,7 @@ namespace DataBlockHelper.DBHelpers
{ {
return WriteG(94,5); return WriteG(94,5);
} }
public static bool WriteG2Pd() public static bool WriteG2Pd()

Write Preview
Loading…
Cancel
Save