From 3a12e3bfeee1b4bfdd87c5ae73b3d167082e7f4c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 2 Jul 2024 11:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E9=A2=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs | 10 ++++++++++
 DM_Weight/ViewModels/ApplyListWindowViewModel.cs    |  5 +++--
 DM_Weight/Views/ApplyListWindow.xaml                |  5 +++--
 DM_Weight/Views/Dialog/DestoryEmptyDialog.xaml      |  7 +------
 DM_Weight/Views/FridgeWindow.xaml                   |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs b/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
index 5d42cd5..aafcec0 100644
--- a/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
@@ -330,6 +330,16 @@ namespace DM_Weight.ViewModels
             {
                 if (SelectDrugPleaseClaim.GetQuantity == 1)
                 {
+                    if(SelectDrugPleaseClaim.DrugManuNo is null)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "药品没有批次效期信息！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        return;
+                    }
                     //请领单里只有一种药
                     List<DrugPleaseManuNo> drugManuInfoList = JsonConvert.DeserializeObject<List<DrugPleaseManuNo>>(SelectDrugPleaseClaim.DrugManuNo);
                     drugManuInfoList.ForEach(dm => dm.DrugId = SelectDrugPleaseClaim.DrugId);
diff --git a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
index d3d73fc..f4a7455 100644
--- a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
@@ -143,12 +143,13 @@ namespace DM_Weight.ViewModels
             CollectDrugLst = SqlSugarHelper.Db.Queryable<CollectDrug>()
                            .Includes<DrugPleaseClaim>(cd => cd.drugPleaseClaim)
                            .Includes<DrugInfo>(cd => cd.drugInfo)
-                           .Where(cd => cd.MachineId.Equals(ConfigurationManager.AppSettings["department"] ?? "DM3"))
+                           .InnerJoin<DrugPleaseClaim>((cd,dp)=>cd.DrugPleaseClaimId==dp.PleaseNo)
+                           .Where(cd => cd.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM3"))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cd) => cd.drugInfo.DrugId.ToString() == SearchValue)
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cd) => cd.drugInfo.DrugName.Contains(SearchValue))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (cd) => cd.drugInfo.PyCode.Contains(SearchValue))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (cd) => cd.drugInfo.DrugBarcode.Contains(SearchValue))
-                           .WhereIF((_DrugPleaseState!=null&& _DrugPleaseState.StateValue>=0),(cd)=>cd.Status==_DrugPleaseState.StateValue)
+                           .WhereIF((_DrugPleaseState!=null&& _DrugPleaseState.StateValue>=0),(cd,dp)=>dp.State==_DrugPleaseState.StateValue)
                            .OrderByDescending(cd => cd.Createdate)
                            .OrderByDescending(cd => cd.DrugId)
                            .ToList();
diff --git a/DM_Weight/Views/ApplyListWindow.xaml b/DM_Weight/Views/ApplyListWindow.xaml
index 8243d31..c3687f2 100644
--- a/DM_Weight/Views/ApplyListWindow.xaml
+++ b/DM_Weight/Views/ApplyListWindow.xaml
@@ -123,6 +123,7 @@
                                             <Expander.Header >
 
                                                 <StackPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Path=Name.PleaseNo,StringFormat=请领单号：{0}，}" FontWeight="Bold" />
                                                     <TextBlock Text="{Binding Path=Name.TotalQuantity,StringFormat=请领数量：{0}，}" FontWeight="Bold" />
                                                     <TextBlock FontWeight="Bold" Text="{Binding Path=Name.ReturnPrQuantity,StringFormat=处方张数：{0}，}" />
                                                     <TextBlock FontWeight="Bold" Text="{Binding Path=Name.DoDate,StringFormat=请领时间：{0}，}" />
@@ -169,12 +170,12 @@
                                     Header="数量"
                                     IsReadOnly="True"
                                     ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                <DataGridTextColumn Width="100"
+                <!--<DataGridTextColumn Width="100"
                         Binding="{Binding CurrentMachineId}"
                         Header="当前所在"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                <!--<DataGridTextColumn Width="80"
+                <DataGridTextColumn Width="80"
                         Binding="{Binding Status,Converter={StaticResource ApplyListConverter}, ConverterParameter=OrderStatus}"
                         Header="状态"
                         IsReadOnly="True"
diff --git a/DM_Weight/Views/Dialog/DestoryEmptyDialog.xaml b/DM_Weight/Views/Dialog/DestoryEmptyDialog.xaml
index 733adbe..b7cce61 100644
--- a/DM_Weight/Views/Dialog/DestoryEmptyDialog.xaml
+++ b/DM_Weight/Views/Dialog/DestoryEmptyDialog.xaml
@@ -43,7 +43,6 @@
                         Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
                         HorizontalAlignment="Right"
                         Command="{Binding BtnCloseCommand}"
-                        IsEnabled="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CloseBtn}"
                         ToolTip="关闭"
                     >
                     <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
@@ -178,16 +177,12 @@
 
                     <Button
                             Margin="2"
-                            Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                            Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
-                            materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
-                            materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                            Style="{StaticResource MaterialDesignRaisedAccentButton}"                           
                             Content="销毁"
                             Command="{Binding DestoryEmptyCommand}">
                     </Button>
                     <Button
                             Margin="2"
-                            Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
                             Style="{StaticResource MaterialDesignRaisedButton}"
                             Background="Orange"
                             BorderBrush="Orange"
diff --git a/DM_Weight/Views/FridgeWindow.xaml b/DM_Weight/Views/FridgeWindow.xaml
index 2e29494..82eed34 100644
--- a/DM_Weight/Views/FridgeWindow.xaml
+++ b/DM_Weight/Views/FridgeWindow.xaml
@@ -101,6 +101,6 @@
             ToolTip="报警状态"
             Content="打开"
             materialDesign:ToggleButtonAssist.OnContent="关闭" />
-        <Button Grid.Row="4" Grid.ColumnSpan="2"  Content="保存" Command="{Binding SaveCommand}" IsEnabled="{Binding BtnIsEnable}" />
+        <Button Grid.Row="4" Grid.ColumnSpan="3"  Content="保存" Command="{Binding SaveCommand}" IsEnabled="{Binding BtnIsEnable}" />
     </Grid>
 </UserControl>