diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index c504a8e..89750d7 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -589,10 +589,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ThreadPool.QueueUserWorkItem((ty) => { AlarmControl(); - sb.Action(); + if (UserJudge.IsSettingNormalUser) { - + sb.Action(); } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs index 07c340a..f30108f 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs @@ -117,6 +117,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu Add(SpecialLabelBlue549); Add(SpecialLabelBlue543); Add(SpecialLabelBlue205); + Add(SpecialLabelBlue204); Add(SpecialLabelBlue361); } @@ -247,8 +248,10 @@ namespace Mesnac.Action.ChemicalWeighing.Qu { Add(SpecialLabelBlue465); Add(SpecialLabelBlue483); - Add(SpecialLabelBlue553); - Add(SpecialLabelBlue569); + Add(SpecialLabelBlue185); + Add(SpecialLabelBlue553); + + Add(SpecialLabelBlue569); Add(SpecialLabelBlue275); Add(SpecialLabelBlue509); Add(SpecialLabelBlue513); @@ -264,7 +267,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu { Add(SpecialLabelBlue465); Add(SpecialLabelBlue483); - Add(SpecialLabelBlue553); + Add(SpecialLabelBlue185); + Add(SpecialLabelBlue553); Add(SpecialLabelBlue569); Add(SpecialLabelBlue275); @@ -279,7 +283,8 @@ Add(SpecialLabelBlue465); { Add(SpecialLabelBlue465); Add(SpecialLabelBlue483); - Add(SpecialLabelBlue553); + Add(SpecialLabelBlue185); + Add(SpecialLabelBlue553); Add(SpecialLabelBlue569); Add(SpecialLabelBlue208); Add(SpecialLabelBlue494); @@ -294,7 +299,8 @@ Add(SpecialLabelBlue465); { Add(SpecialLabelBlue465); Add(SpecialLabelBlue483); - Add(SpecialLabelBlue553); + Add(SpecialLabelBlue185); + Add(SpecialLabelBlue553); Add(SpecialLabelBlue569); Add(SpecialLabelBlue208); @@ -546,6 +552,10 @@ public SpecialLabelBlue SpecialLabelBlue516 { get; set; } public SpecialLabelBlue SpecialLabelBlue228 { get; set; } public SpecialLabelBlue SpecialLabelBlue230 { get; set; } + public SpecialLabelBlue SpecialLabelBlue185 { get; set; } + + + public bool GetValue(string address) { var plc= PlcConnect.Instance.ReadBool(address).Content; diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index f55d50e..b72e32d 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -12976,7 +12976,7 @@ MintCream 344, 328 SpecialLabelBlue483 - 365, 1 + 265, 1