maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改核对药品页面显示不全问题，核对药品确认时不校验效期

This commit is contained in:
maqiao 2024-11-29 13:00:15 +08:00
parent b3c39e6d71
commit 175013ae84
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -550,7 +550,7 @@ namespace DM_Weight.ViewModels
ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>() ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>()
.Where(cs => cs.DrugId == oi._OrderDetail.DrugId .Where(cs => cs.DrugId == oi._OrderDetail.DrugId
&& cs.ManuNo == oi._OrderDetail.SetManuNo && cs.ManuNo == oi._OrderDetail.SetManuNo
&& cs.EffDate == oi._OrderDetail.SetEffDate // && cs.EffDate == oi._OrderDetail.SetEffDate
&& cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")
&& cs.DrawerNo == drawerNo).First(); && cs.DrawerNo == drawerNo).First();
if (cs == null) if (cs == null)

14
DM_Weight/Views/CheckOrderNewWindow.xaml
View File

@ -166,13 +166,13 @@
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="80" <GridViewColumn Width="60"
Header="姓名" Header="姓名"
DisplayMemberBinding="{Binding PName}" /> DisplayMemberBinding="{Binding PName}" />
<GridViewColumn Width="30" <GridViewColumn Width="30"
DisplayMemberBinding="{Binding Sex}" DisplayMemberBinding="{Binding Sex}"
Header="性别"/> Header="性别"/>
<GridViewColumn Width="100" <GridViewColumn Width="80"
DisplayMemberBinding="{Binding OrderNo}" DisplayMemberBinding="{Binding OrderNo}"
Header="单号"/> Header="单号"/>
<!--<GridViewColumn Width="240" <!--<GridViewColumn Width="240"
@ -191,28 +191,28 @@
DisplayMemberBinding="{Binding _OrderDetail.Quantity}" DisplayMemberBinding="{Binding _OrderDetail.Quantity}"
Header="数量"/>--> Header="数量"/>-->
<GridViewColumn Width="100" Header="药品名称"> <GridViewColumn Width="80" Header="药品名称">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="DrugInfo.DrugName" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox> <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="DrugInfo.DrugName" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="100" Header="药品批次"> <GridViewColumn Width="80" Header="药品批次">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox> <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="100" Header="药品效期"> <GridViewColumn Width="80" Header="药品效期">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetEffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox> <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetEffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="100" Header="数量"> <GridViewColumn Width="30" Header="数量">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox> <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
@ -236,7 +236,7 @@
</ListView.Resources> </ListView.Resources>
<ListView.View> <ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}"> <GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Width="100" <GridViewColumn Width="80"
DisplayMemberBinding="{Binding DrugName}" DisplayMemberBinding="{Binding DrugName}"
Header="药品名称"/> Header="药品名称"/>
<GridViewColumn Width="30" <GridViewColumn Width="30"

4
DM_Weight/Views/CheckSelfOrderWindow.xaml
View File

@ -222,7 +222,7 @@
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="40" Header="数量"> <GridViewColumn Width="30" Header="数量">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox> <ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
@ -246,7 +246,7 @@
</ListView.Resources> </ListView.Resources>
<ListView.View> <ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource st}"> <GridView ColumnHeaderContainerStyle="{StaticResource st}">
<GridViewColumn Width="100" <GridViewColumn Width="80"
DisplayMemberBinding="{Binding DrugName}" DisplayMemberBinding="{Binding DrugName}"
Header="药品名称"/> Header="药品名称"/>
<GridViewColumn Width="30" <GridViewColumn Width="30"