diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs index de6d5d7..5157769 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs @@ -26,10 +26,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity } - public class HslAgvCarEntity - { - public HslAgvCar HslAgvCar1 { get; set; } - } + //public class HslAgvCarEntity + //{ + // public HslAgvCar HslAgvCar1 { get; set; } + //} public class HslLanternSimpleEntity { diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index a74203f..4ad9948 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -89,7 +89,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl //控件实体类 HslLanternAlarmEntity HslAlarmE = new HslLanternAlarmEntity(); - HslAgvCarEntity hslAgvCarEntity = new HslAgvCarEntity(); + // HslAgvCarEntity hslAgvCarEntity = new HslAgvCarEntity(); HslLanternSimpleEntity HslLanternSimpleE = new HslLanternSimpleEntity(); MCLabelEntity LabelE = new MCLabelEntity(); @@ -180,7 +180,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl private void SetAllControls() { ControlsHelper.ControlImport(HslAlarmE, Controls); - ControlsHelper.ControlImport(hslAgvCarEntity, Controls); + // ControlsHelper.ControlImport(hslAgvCarEntity, Controls); ControlsHelper.ControlImport(HslLanternSimpleE, Controls); ControlsHelper.ControlImport(LabelE, Controls); @@ -339,7 +339,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl //目前只有主线程可以 //小车到位信号 - ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm1, hslAgvCarEntity.HslAgvCar1, reachSingle[0]); + ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm1, reachSingle[0]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm2, reachSingle[1]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm3, reachSingle[2]); ControlsHelper.SetHslLanternAlarm(HslAlarmE.HslLanternAlarm4, reachSingle[3]);