From aadc0be0ab48a00110f4fd8b975b49820af4bc53 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Fri, 17 Jan 2025 11:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=AE=B1=E5=80=BC=E7=8F=AD?= =?UTF-8?q?=E8=B7=9F=E5=91=A8=E8=BD=AC=E9=83=BD=E5=8F=AF=E4=BB=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E5=9B=9E=E6=94=B6=E7=AE=B1=E6=9F=A5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=97=B4=E9=9A=94100ms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Port/PortUtil.cs | 4 ++-- DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DM_Weight/Port/PortUtil.cs b/DM_Weight/Port/PortUtil.cs index 5c6bcd2..348cd51 100644 --- a/DM_Weight/Port/PortUtil.cs +++ b/DM_Weight/Port/PortUtil.cs @@ -545,7 +545,7 @@ namespace DM_Weight.Port } else { - Thread.Sleep(50); + Thread.Sleep(100); // 灯在闪烁继续监听状态 GetBackDoorState(); } @@ -582,7 +582,7 @@ namespace DM_Weight.Port }); logger.Info($"储物箱打开成功"); } - Thread.Sleep(50); + Thread.Sleep(100); // 灯在闪烁继续监听状态 GetBackDoorState(); } diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs index 42fc5f7..f1a5610 100644 --- a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs +++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs @@ -105,8 +105,8 @@ namespace DM_Weight.ViewModels Channels = SqlSugarHelper.Db.Queryable() .LeftJoin((cs,di) => cs.DrugId == di.DrugId.ToString()) .Where((cs) => cs.DrawerType != 1) - .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉 - .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2) + //.WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉 + //.WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")) .Select((cs, di) => new ChannelStock{ CanReturnQuantity = SqlFunc.Subqueryable().Where(mr => mr.DrugId == cs.DrugId&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,