diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 61ec344..eb5afea 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -314,7 +314,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl var reachSingle = RgvPlcUtil.GetRGVAllError(); var mixSingle = Db3000Helper.ReadDb(); - RGVRecord(reachSingle, mixSingle); + if(UserJudge.IsNormalUser()) + { + RGVRecord(reachSingle, mixSingle); + } //目前只有主线程可以 //小车到位信号 @@ -496,10 +499,11 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl for (int i = 0; i < 8; i++) { int deviceNo = i + 1; - //判断有没有done = false的设备记录,如果为空就新建一条记录 + //判断有没有done = false的设备记录 var record = FreeSqlUnit.Instance.Select().Where(x => x.DeviceNo == deviceNo && !x.Done).ToList().FirstOrDefault(); if (record != null) { + //混炼结束 RGV未到达 if (record.MixIsReady && !record.RGVIsReach) { switch (deviceNo) @@ -548,6 +552,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl break; } } + //混炼结束 RGV到达 else if (record.MixIsReady && record.RGVIsReach) { switch (deviceNo)