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

修改报表模板

This commit is contained in:
maqiao 2025-10-16 10:26:00 +08:00
parent 443bd58414
commit 042470e390
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DM_Weight/ReportTemp/account_book_new.grf
View File

@ -229,6 +229,7 @@
{ {
"Column":"批次", "Column":"批次",
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
"ShrinkFontToFit":true,
"DataField":"批号" "DataField":"批号"
}, },
{ {

26
DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs
View File

@ -562,32 +562,6 @@ namespace DM_Weight.ViewModels
DrawerType = currentList.DrawerType; DrawerType = currentList.DrawerType;
//string currentDrawerUser = currentList.BelongUser; //string currentDrawerUser = currentList.BelongUser;
string currentDrawerUser = HomeWindowViewModel.Operator.UserBarcode; string currentDrawerUser = HomeWindowViewModel.Operator.UserBarcode;
//OrderInfoList = SqlSugarHelper.Db.Queryable<OrderInfo>()
// .Includes(oi => oi._OrderDetail, od => od.DrugInfo)
// .Includes(oi => oi._OrderDetail, od => od.surgicalResidual)
// .WhereIF(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
// .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"])
// .Where(oi => oi.DmStatus == 0)
// .Where(oi => oi.HisDispFlag == 0)
// .Where(oi => oi.CancelFlag == 0)
// .Where(oi => oi.DoctorCode == currentDrawerUser)
// .Where(oi => oi._OrderDetail.SetManuNo != null&&oi._OrderDetail.SetManuNo!="null")
// .Where(oi=>oi._OrderDetail.Quantity>0)
// .Where(oi=>oi._OrderDetail.surgicalResidual.SendNo== DrawerNo.ToString())
// .OrderBy(oi => oi.OrderId)
// .ToPageList(PageNum, PageSize, ref totalCount);
//if (OrderInfoList != null && OrderInfoList.Count() > 0)
//{
// OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
// OrderInfoList.ForEach(oi => oi._OrderDetail.DrugInfo = oi._OrderDetail.DrugInfo ?? new DrugInfo());
// //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi.OrderDetailList.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item.OrderDetailList.Quantity) }).ToList();
// TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).Select(OrderDetailList => OrderDetailList._OrderDetail).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
//}
//else
//{
// TotalDrugList = null;
//}
SurgicalResidualList = SqlSugarHelper.Db.Queryable<SurgicalResidual>() SurgicalResidualList = SqlSugarHelper.Db.Queryable<SurgicalResidual>()
.Includes(sr => sr.DrugInfo) .Includes(sr => sr.DrugInfo)
.WhereIF(OrderDate != null, sr => sr.CreateTime.ToString("yyyy-MM-dd") == OrderDate) .WhereIF(OrderDate != null, sr => sr.CreateTime.ToString("yyyy-MM-dd") == OrderDate)

7
DM_Weight/Views/CheckSelfOrderWindow.xaml
View File

@ -129,9 +129,7 @@
IsEnabled="{Binding SelfEnable}" IsEnabled="{Binding SelfEnable}"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}" materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}" materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
Style="{StaticResource MaterialDesignOutlinedLightButton}"/>--> Style="{StaticResource MaterialDesignOutlinedLightButton}"/>--><Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding ReturnBoxCommand}" Content="还药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=ReturnBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"> </Button>
<Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding TakeBoxCommand}" Content="取药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"></Button>
<Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding ReturnBoxCommand}" Content="还药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=ReturnBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"> </Button>
<Button Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" <Button Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}"
Margin="0 0 6 0" Margin="0 0 6 0"
VerticalAlignment="Center" Command="{Binding CheckOrder}" VerticalAlignment="Center" Command="{Binding CheckOrder}"
@ -150,6 +148,9 @@
ToolTip="刷新" Command="{Binding Query}"> ToolTip="刷新" Command="{Binding Query}">
<materialDesign:PackIcon Kind="Refresh" /> <materialDesign:PackIcon Kind="Refresh" />
</Button> </Button>
<Button Margin="6 0 6 0" VerticalAlignment="Center" Command="{Binding TakeBoxCommand}" Content="取药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"></Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
<!--<Grid Grid.Row="1" Grid.Column="0" Margin="0 0 -100 0">--> <!--<Grid Grid.Row="1" Grid.Column="0" Margin="0 0 -100 0">-->