From df3657ffe27dea5f125e753ee3b48b7c7a176caf Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Mon, 18 Nov 2024 09:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E5=8A=A0=E8=8D=AF=E5=8F=8A?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E5=8F=96=E8=8D=AF=E6=B7=BB=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E8=8D=AF=E7=9B=92=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E5=8F=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E5=88=99=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs | 4 ++++ DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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; }