diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs index c95400b..7fb6dfb 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs @@ -407,6 +407,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl switch (ControlsHelper.DrySelect(RadioE)) { case 1: + LjPlanningPlcHelp.DownD1Recipe(recipes, steps); DeviceMaterrialService.Save(materials); break; diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs index 75cb861..a50d965 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjPlanning/LjPlanningPlcHelp.cs @@ -32,6 +32,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjPlanning public static List GetWeterM7 => GetWeterView(3338); public static List GetWeterM8 => GetWeterView(3538); + + + /// /// 干混机1 /// @@ -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); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index 0e88975..2ae4c29 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -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; } + //} } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index c1781b6..dd3c701 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -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); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 09c980d..b581d6b 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -2437,46 +2437,6 @@ MCLabel148 19, 19 - - - - Red - DarkGray - - - False - - - - None - True - True - WatchDog - Red - 33, 71 - MCLabel149 - 53, 12 - - - - - Red - DarkGray - - - False - - - - Modify - True - True - 0 - Red - 53, 89 - MCWatchDog - 11, 12 - @@ -10549,25 +10509,6 @@ DistributionBox1 30, 50 - - - - sssStop - 2, 1 - WatchDog - 45, 43 - - - - sssStop - 5, 43 - EMStop - 39, 36 - - 33, 148 - Panel2 - 48, 83 -