diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 98206c1..c504a8e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -589,9 +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 c73a1b7..07c340a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Qu/Sb.cs @@ -61,8 +61,8 @@ namespace Mesnac.Action.ChemicalWeighing.Qu } - //压送A-B - var boo = GetValue("M151.5"); + //压送A-A + var boo = GetValue("M172.5"); if (boo) { @@ -70,6 +70,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu Add(SpecialLabelBlue478); Add(SpecialLabelBlue549); Add(SpecialLabelBlue543); + Add(SpecialLabelBlue273); Add(SpecialLabelBlue510); @@ -79,7 +80,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu } //压送A-A - boo = GetValue("M172.5"); + boo = GetValue("M151.5"); if (boo) { Add(SpecialLabelBlue463); @@ -101,6 +102,7 @@ namespace Mesnac.Action.ChemicalWeighing.Qu Add(SpecialLabelBlue478); Add(SpecialLabelBlue549); Add(SpecialLabelBlue543); + Add(SpecialLabelBlue205); Add(SpecialLabelBlue495); }