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

merge

Browse Source
wangsr
nodyang 1 year ago
parent 732fd48f6e
commit 25a8cad456
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

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

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

2
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjMixManager/LjMixManagerDb.cs
Unescape Escape View File

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

10
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/DownloadAction.cs
Unescape Escape View File

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

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

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

2
DataBlockHelper/DBHelpers/DB2104Helper.cs
Unescape Escape View File

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

2
DataBlockHelper/DBHelpers/DB2104WriteHelper.cs
Unescape Escape View File

@ -62,7 +62,7 @@ namespace DataBlockHelper.DBHelpers
var siemensS7Net = PlcConnect.Instance; var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:{start}.0", entity.Bin); siemensS7Net.Write($"{DbName}:{start}.0", entity.Bin);
siemensS7Net.Write($"{DbName}:{start+2}.0", entity.Set); siemensS7Net.Write($"{DbName}:{start+2}.0", entity.Set);
siemensS7Net.Write($"{DbName}:{start+6}.0", entity.TolErance); siemensS7Net.Write($"{DbName}:{start+6}.0", entity.Tolerance);
} }
} }
} }
Write Preview
Loading…
Cancel
Save