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

修复干混机配方变异量位置不对的bug

Browse Source
dep
我叫锄头 1 year ago
parent e5646b008a
commit c63e6181e0
5 changed files with 19 additions and 74 deletions
Show Stats Download Patch File Download Diff File

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

@ -407,6 +407,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
switch (ControlsHelper.DrySelect(RadioE))
{
case 1:
LjPlanningPlcHelp.DownD1Recipe(recipes, steps);
DeviceMaterrialService.Save(materials);
break;

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

@ -32,6 +32,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
public static List<MixStep> GetWeterM7 => GetWeterView(3338);
public static List<MixStep> GetWeterM8 => GetWeterView(3538);
/// <summary>
/// 干混机1
/// </summary>
@ -51,7 +54,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
}
begin += 178;
begin = 178;
for (int i = 0; i < recipeSteps.Count(); i++)
{
var view = recipeSteps[i];
@ -682,7 +685,7 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning
private static void DowSteps(int start, Step step)
{
int mixCode = start;
PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode);
var info= PlcConnect.Instance.Write($"DB2104.{mixCode}.0", step.MixCode);
int mixTime = start + 2;
PlcConnect.Instance.Write($"DB2104.{mixTime}.0", step.MixTime);

10
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs
Unescape Escape View File

@ -551,9 +551,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity
public ThreeWayValve DV2PCP14 { get; set; }
}
public class DeviceDetailEntity
{
public StateButton WatchDog { get; set; }
public SystemStateShow EMStop { get; set; }
}
//public class DeviceDetailEntity
//{
// public StateButton WatchDog { get; set; }
// public SystemStateShow EMStop { get; set; }
//}
}

16
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs
Unescape Escape View File

@ -83,7 +83,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
private PlcReadTempEntity PlcReadTemp = new PlcReadTempEntity();
//报警列表控件
private MCLabel MCWatchDog;
//private MCLabel MCWatchDog;
private HslMoveText AlarmMoveText;
//控件实体类
@ -98,7 +98,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
ControlCabinetEntity ControlCabinetE = new ControlCabinetEntity();
LjSwithEntity SwithE = new LjSwithEntity();
ThreeWayValveEntity ThreeValveE = new ThreeWayValveEntity();
DeviceDetailEntity DetailE = new DeviceDetailEntity();
// DeviceDetailEntity DetailE = new DeviceDetailEntity();
HslLedDisplayEntity LedDisplayE = new HslLedDisplayEntity();
#endregion
@ -116,10 +116,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
Controls = GetAllControls();
DetailE.WatchDog = Controls.FirstOrDefault(x => x.Name == "WatchDog") as StateButton;
DetailE.EMStop = Controls.FirstOrDefault(x => x.Name == "EMStop") as SystemStateShow;
//DetailE.WatchDog = Controls.FirstOrDefault(x => x.Name == "WatchDog") as StateButton;
//DetailE.EMStop = Controls.FirstOrDefault(x => x.Name == "EMStop") as SystemStateShow;
MCWatchDog = Controls.FirstOrDefault(x => x.Name == "MCWatchDog") as MCLabel;
// MCWatchDog = Controls.FirstOrDefault(x => x.Name == "MCWatchDog") as MCLabel;
AlarmMoveText = Controls.FirstOrDefault(x => x.Name == "AlarmMoveText") as HslMoveText;
SetAllControls();
@ -1293,7 +1293,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
var normalStatusWatchDog = DB2107.NormalStatus.WatchDog;
PlcReadTemp.WatchDog_Set = normalStatusWatchDog >= 1 ? true : false;
MCWatchDog.MCValue = normalStatusWatchDog.ToString();
//MCWatchDog.MCValue = normalStatusWatchDog.ToString();
PlcReadTemp.EMStop_Set = DB2107.NormalStatus.EMStop;
PlcReadTemp.Vessel_1_HighLevel_Set = DB2107.Weight.Vessel_1.HighLevel;
@ -1518,8 +1518,8 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
//yang 增加4的显示
ControlsHelper.SetMCLabel(LabelE.ValueWeight4, PlcReadTemp.ValueWeight4);
ControlsHelper.SetStateButton(DetailE.WatchDog, PlcReadTemp.WatchDog_Set);
ControlsHelper.SetSystemStateShow(DetailE.EMStop, PlcReadTemp.EMStop_Set);
//ControlsHelper.SetStateButton(DetailE.WatchDog, PlcReadTemp.WatchDog_Set);
//ControlsHelper.SetSystemStateShow(DetailE.EMStop, PlcReadTemp.EMStop_Set);
ControlsHelper.SetSwitchLight(LightE.Vessel_1_HighLevel, PlcReadTemp.Vessel_1_HighLevel_Set, false);

59
Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml
Unescape Escape View File

@ -2437,46 +2437,6 @@
<Property name="Name">MCLabel148</Property>
<Property name="Size">19, 19</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel149" children="Controls">
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">None</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">WatchDog</Property>
<Property name="ForeColor">Red</Property>
<Property name="Location">33, 71</Property>
<Property name="Name">MCLabel149</Property>
<Property name="Size">53, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCWatchDog" children="Controls">
<Property name="Format" />
<Property name="TextName" />
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
<Property name="MCDataSourceID" />
<Property name="IsDbControl">False</Property>
<Property name="InitDataSource" />
<Property name="ActionDataSource" />
<Property name="BindDataSource" />
<Property name="DbOptionType">Modify</Property>
<Property name="MCVisible">True</Property>
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">Red</Property>
<Property name="Location">53, 89</Property>
<Property name="Name">MCWatchDog</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel157" children="Controls">
<Property name="Format" />
<Property name="TextName" />
@ -10549,25 +10509,6 @@
<Property name="Name">DistributionBox1</Property>
<Property name="Size">30, 50</Property>
</Object>
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel2" children="Controls">
<Object type="Mesnac.Controls.ChemicalWeighing.StateButton, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="WatchDog" children="Controls">
<Property name="StatusName" />
<Property name="Status">sssStop</Property>
<Property name="Location">2, 1</Property>
<Property name="Name">WatchDog</Property>
<Property name="Size">45, 43</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.SystemStateShow, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="EMStop" children="Controls">
<Property name="StatusName" />
<Property name="Status">sssStop</Property>
<Property name="Location">5, 43</Property>
<Property name="Name">EMStop</Property>
<Property name="Size">39, 36</Property>
</Object>
<Property name="Location">33, 148</Property>
<Property name="Name">Panel2</Property>
<Property name="Size">48, 83</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="BU1BLT07" children="Controls">
<Property name="AlarmName" />
<Property name="SetName" />

Write Preview
Loading…
Cancel
Save