diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs index bbdaff2..340f728 100644 --- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs +++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs @@ -453,7 +453,7 @@ namespace DM_Weight.ViewModels public void FindDrawerCount() { - int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) + int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count(); Is8Drawer = count < 9; Is16Drawer = count >= 16; diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs index ef19b37..74c3ffa 100644 --- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs @@ -330,7 +330,7 @@ namespace DM_Weight.ViewModels public void FindDrawerCount() { - int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) + int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count(); Is8Drawer = count < 9; Is16Drawer = count >= 16; diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs index 769ebf5..0df3f08 100644 --- a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs @@ -280,7 +280,8 @@ namespace DM_Weight.ViewModels public void FindDrawerCount() { - int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) + //int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) + int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count(); Is8Drawer = count < 9; Is16Drawer = count >= 16; diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs index 6b35330..2002858 100644 --- a/DM_Weight/ViewModels/HomeWindowViewModel.cs +++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs @@ -237,7 +237,7 @@ namespace DM_Weight.ViewModels public void FindDrawerCount() { - int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) + int count = SqlSugarHelper.Db.Queryable().Where(cs => cs.DrawerType != 3) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrawerNo).Select(cs => SqlFunc.AggregateCount(cs.DrawerNo)).Count(); Is16Drawer = count == 16;