From 8a61c1017f0debff1ee76083422fbd9da9fc89e2 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Tue, 27 May 2025 15:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E5=8A=A0=E8=8D=AF=E5=86=99=E6=A0=87=E7=AD=BE?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ViewModels/AddDrugControlViewModel.cs | 2 +- DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs index 459f44e..8b08d74 100644 --- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs +++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs @@ -398,7 +398,7 @@ namespace DM_Weight.ViewModels } // 更新屏显库存 //List singleChannels = record.FindAll(it => it.BoardType != 1); - List singleChannels = ChannelStocks.Where(it => it.BoardType != 1) + List singleChannels = ChannelStocks.Where(it => it.BoardType == 5&&(it.AddQuantity>0||it.Quantity>0)) .GroupBy(it => it.ColNo) .Select(it => { diff --git a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs index 768b983..5daed89 100644 --- a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs @@ -729,7 +729,7 @@ namespace DM_Weight.ViewModels List q = SqlSugarHelper.Db.Queryable() .Includes(cs => cs.DrugInfo) .InnerJoin((cs, cl) => cs.Chnguid == cl.Id && cs.DrugId == cl.DrugId) - .Where(cs => cs.DrawerType == 1&&cs.DrawerNo==11) + .Where(cs => cs.DrawerType == 1) .Where(cs => cs.DrugId != null) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")) .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉，双人登录开后8个抽屉