diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs index fd91055..ee12798 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs @@ -760,6 +760,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl #endregion #endregion + #region 维修模式 public static void RepairOnOff(MCLabelEntity LabelE, MCRadioButtonEntity RadioE) diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs index 0c792d6..4db1404 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs @@ -25,6 +25,7 @@ using Mesnac.Action.ChemicalWeighing.LjMaterial; using Mesnac.Action.ChemicalWeighing.MinAn; using System.Xml.Serialization; using System.Threading; +using DataBlockHelper.DBHelpers; namespace Mesnac.Action.ChemicalWeighing.ManualControl { @@ -349,10 +350,17 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl { Focus.Focus(); + DB2119Helper DB2119 = new DB2119Helper(); + #region 水称称量按钮 if (StartMetage1 == runtime.Sender) { + if (DB2119.Coolwater_A.Dos_Status) + { + MessageBox.Show("冷水称A正在排水!请稍后再称量"); + return; + } short value; if (short.TryParse(Convert.ToString(SetWaterValue1.MCValue), out value)) { @@ -383,6 +391,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl if (StartMetage2 == runtime.Sender) { + if (DB2119.Hotwater_A.Dos_Status) + { + MessageBox.Show("热水称A正在排水!请稍后再称量"); + return; + } short value; if (short.TryParse(Convert.ToString(SetWaterValue2.MCValue), out value)) { @@ -414,6 +427,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl if (StartMetage3 == runtime.Sender) { + if (DB2119.Coolwater_B.Dos_Status) + { + MessageBox.Show("冷水称B正在排水!请稍后再称量"); + return; + } short value; if (short.TryParse(Convert.ToString(SetWaterValue3.MCValue), out value)) { @@ -444,6 +462,11 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl if (StartMetage4 == runtime.Sender) { + if (DB2119.Hotwater_B.Dos_Status) + { + MessageBox.Show("热水称B正在排水!请稍后再称量"); + return; + } short value; if (short.TryParse(Convert.ToString(SetWaterValue4.MCValue), out value)) {