From b4cb0ff923ff439b59e31eefeca37d4776ce0506 Mon Sep 17 00:00:00 2001 From: wangsr Date: Sat, 23 Dec 2023 14:25:00 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=B7=BB=E5=8A=A0=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E8=BF=9B=E8=A1=8CRGV=E8=AE=A1=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainDetailControl/MainDetailControlAction.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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)