From deb7b044e9a62156e94cf1b4f0b2e076471c46bc Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Wed, 9 Oct 2024 11:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E7=A9=BA=E7=93=B6=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AEmachine=5Fid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=AF=E8=BF=98=E8=8D=AF=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs | 2 +- DM_Weight/Views/ReturnEmptyWindow.xaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs index a7850fa..42fc5f7 100644 --- a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs +++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs @@ -109,7 +109,7 @@ namespace DM_Weight.ViewModels .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).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) , + 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)) , DrugInfo = new DrugInfo { DrugId = di.DrugId, diff --git a/DM_Weight/Views/ReturnEmptyWindow.xaml b/DM_Weight/Views/ReturnEmptyWindow.xaml index 8487b3a..250ab72 100644 --- a/DM_Weight/Views/ReturnEmptyWindow.xaml +++ b/DM_Weight/Views/ReturnEmptyWindow.xaml @@ -34,7 +34,7 @@ - - + -->