diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs index fc76775..453a82d 100644 --- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs @@ -448,6 +448,10 @@ namespace DM_Weight.ViewModels .Where(cs => cs.DrugId != null) .OrderBy(cs => cs.ColNo) .ToList(); + if (queryData != null && queryData.Count > 0) + { + OpenBoxVisibility = queryData[0].BoardType == 3 ? true : queryData[0].BoardType == 35 ? true : false; + } ChannelStocks = queryData.Select(cs => { cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo)); diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs index 5427c0e..5ca8645 100644 --- a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs @@ -451,7 +451,10 @@ namespace DM_Weight.ViewModels .OrderBy(cs => cs.ColNo) .ToList(); - OpenBoxVisibility = queryData[0].BoardType == 3 ? true : queryData[0].BoardType == 35 ? true : false ; + if (queryData != null && queryData.Count > 0) + { + OpenBoxVisibility = queryData[0].BoardType == 3 ? true : queryData[0].BoardType == 35 ? true : false; + } ChannelStocks = queryData; }