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

还空瓶页面添加根据machine_id查询可还药数量

This commit is contained in:
maqiao 2024-10-09 11:50:03 +08:00
parent d31b7016a7
commit 73ab5d4bd4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
View File

@ -109,7 +109,7 @@ namespace DM_Weight.ViewModels
.WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 8) .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 8)
.Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")) .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
.Select((cs, di) => new ChannelStock{ .Select((cs, di) => new ChannelStock{
CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) , CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
DrugInfo = new DrugInfo DrugInfo = new DrugInfo
{ {
DrugId = di.DrugId, DrugId = di.DrugId,

4
DM_Weight/Views/ReturnEmptyWindow.xaml
View File

@ -34,7 +34,7 @@
<ColumnDefinition Width="0.5*"/> <ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel <!--<StackPanel
Margin="0 0 0 0"> Margin="0 0 0 0">
<Button <Button
HorizontalAlignment="Right" HorizontalAlignment="Right"
@ -42,7 +42,7 @@
Command="{Binding ReturnRecordCommand}" Command="{Binding ReturnRecordCommand}"
Style="{StaticResource MaterialDesignOutlinedLightButton}" Content="导出回收登记记录"> Style="{StaticResource MaterialDesignOutlinedLightButton}" Content="导出回收登记记录">
</Button> </Button>
</StackPanel> </StackPanel>-->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"
Grid.Column="1"> Grid.Column="1">
<Button <Button