From 175013ae8440f6d8a1e480019d8866ba76bd4589 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 29 Nov 2024 13:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E5=AF=B9=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=A0=B8=E5=AF=B9=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=97=B6=E4=B8=8D=E6=A0=A1=E9=AA=8C=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/CheckOrderNewWindowViewModel.cs     |  2 +-
 DM_Weight/Views/CheckOrderNewWindow.xaml           | 14 +++++++-------
 DM_Weight/Views/CheckSelfOrderWindow.xaml          |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 89b76a0..a16b86b 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -550,7 +550,7 @@ namespace DM_Weight.ViewModels
                             ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                              .Where(cs => cs.DrugId == oi._OrderDetail.DrugId
                                                     && cs.ManuNo == oi._OrderDetail.SetManuNo
-                                                    && cs.EffDate == oi._OrderDetail.SetEffDate
+                                                   // && cs.EffDate == oi._OrderDetail.SetEffDate
                                                     && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")
                                                     && cs.DrawerNo == drawerNo).First();
                             if (cs == null)
diff --git a/DM_Weight/Views/CheckOrderNewWindow.xaml b/DM_Weight/Views/CheckOrderNewWindow.xaml
index 24afb69..ec0e976 100644
--- a/DM_Weight/Views/CheckOrderNewWindow.xaml
+++ b/DM_Weight/Views/CheckOrderNewWindow.xaml
@@ -166,13 +166,13 @@
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="80"
+                        <GridViewColumn Width="60"
                         Header="姓名"
                         DisplayMemberBinding="{Binding PName}" />
                         <GridViewColumn Width="30"
                         DisplayMemberBinding="{Binding Sex}"
                         Header="性别"/>
-                        <GridViewColumn  Width="100"
+                        <GridViewColumn  Width="80"
                         DisplayMemberBinding="{Binding OrderNo}"
                         Header="单号"/>
                         <!--<GridViewColumn Width="240"
@@ -191,28 +191,28 @@
                         DisplayMemberBinding="{Binding _OrderDetail.Quantity}"
                         Header="数量"/>-->
                         
-                        <GridViewColumn Width="100" Header="药品名称">
+                        <GridViewColumn Width="80" Header="药品名称">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="DrugInfo.DrugName" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100" Header="药品批次">
+                        <GridViewColumn Width="80" Header="药品批次">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100" Header="药品效期">
+                        <GridViewColumn Width="80" Header="药品效期">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetEffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="100" Header="数量">
+                        <GridViewColumn Width="30" Header="数量">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
@@ -236,7 +236,7 @@
                     </ListView.Resources>
                     <ListView.View>
                         <GridView ColumnHeaderContainerStyle="{StaticResource st}">
-                            <GridViewColumn Width="100"
+                            <GridViewColumn Width="80"
                                 DisplayMemberBinding="{Binding DrugName}"
                                 Header="药品名称"/>
                             <GridViewColumn Width="30"
diff --git a/DM_Weight/Views/CheckSelfOrderWindow.xaml b/DM_Weight/Views/CheckSelfOrderWindow.xaml
index 7bcf3a8..c4a8128 100644
--- a/DM_Weight/Views/CheckSelfOrderWindow.xaml
+++ b/DM_Weight/Views/CheckSelfOrderWindow.xaml
@@ -222,7 +222,7 @@
                                 </DataTemplate>
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
-                        <GridViewColumn Width="40" Header="数量">
+                        <GridViewColumn Width="30" Header="数量">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate>
                                     <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
@@ -246,7 +246,7 @@
                 </ListView.Resources>
                 <ListView.View>
                     <GridView ColumnHeaderContainerStyle="{StaticResource st}">
-                        <GridViewColumn Width="100"
+                        <GridViewColumn Width="80"
                                 DisplayMemberBinding="{Binding DrugName}"
                                 Header="药品名称"/>
                         <GridViewColumn Width="30"