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

处方专用账册添加按处方日期字段排序 

盘点时值班盘点值班，周转盘点周转，盘点记录分别看
This commit is contained in:
maqiao 2024-12-06 18:52:00 +08:00
parent 9fcf388571
commit 96e79b2514
5 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -310,7 +310,7 @@ namespace DM_Weight.Report
{
SQL += $" and oi.order_no='{orderNo}'";
}
SQL += " order by di.drug_id";
SQL += " order by di.drug_id,oi.recv_date";
Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
Report.DetailGrid.Recordset.QuerySQL = SQL;

2
DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs
View File

@ -642,7 +642,7 @@ namespace DM_Weight.ViewModels
private HkcChangeShifts GetOperator()
{
//查询发药人及审核人
HkcChangeShifts changeOperator = SqlSugarHelper.Db.Queryable<HkcChangeShifts>().Single(change => change.State == "0");
HkcChangeShifts changeOperator = SqlSugarHelper.Db.Queryable<HkcChangeShifts>().Single(change => change.Machineid == (ConfigurationManager.AppSettings["machineId"] ?? "DM1") && change.State == "0");
//if (changeOperator != null)
//{
// Operator = SqlSugarHelper.Db.Queryable<UserList>().Single(u => u.UserName == changeOperator.FromOperator);

4
DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs
View File

@ -158,7 +158,9 @@ namespace DM_Weight.ViewModels
//strSql += " GROUP BY C.optdate,Drug_id ORDER BY C.OPTDATE DESC";
List<CheckRecordStock> checkList = SqlSugarHelper.Db.Queryable<CheckRecordStock>()
.Includes<DrugInfo>(cs => cs.DrugInfo)
.Where(cs => cs.optdate == OptDate).OrderByDescending(cs => cs.optdate).ToList();
.Where(cs => cs.optdate == OptDate).OrderByDescending(cs => cs.optdate)
.WhereIF(App.SingleModel, cs => cs.rowNo <= 2) //单人登录开前2个抽屉，双人登录开后14个抽屉
.WhereIF(!(App.SingleModel), cs => cs.rowNo > 2).ToList();
ICollectionView vw = CollectionViewSource.GetDefaultView(checkList);
vw.GroupDescriptions.Add(new PropertyGroupDescription("DrugInfo"));
obsCheckRecordStock = new ObservableCollection<CheckRecordStock>(checkList);

9
DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
View File

@ -455,6 +455,15 @@ namespace DM_Weight.ViewModels
string strSql = $@"SELECT cl.`row_no` AS rowNo,cl.`col_no` AS colNo,cl.`quantity` AS quantity,cl.`manu_no` AS manuNo,cl.`eff_date` AS effDate,
di.`drug_name` AS drugName,di.`drug_spec` AS drugSpec,di.`pack_unit` AS packUnit,di.`manufactory` AS manufactory,di.`max_stock` maxStock,
cl.`drug_id` AS drugId,cl.`machine_id` AS MachineId FROM channel_stock cl INNER JOIN drug_info di ON di.`drug_id` = cl.`drug_id` WHERE cl.`machine_id` = '{machine_id}' AND cl.`drawer_type` = 1 ORDER BY cl.`drug_id`";
if (App.SingleModel)
{
strSql += " AND ROW_NO<=8";
}
else
{
strSql += " AND ROW_NO>8";
}
strSql += " ORDER BY cl.`drug_id`";
List<CheckRecordStock> checkRecordStockList = SqlSugarHelper.Db.SqlQueryable<dynamic>(strSql)
.AddParameters(new
{

12
DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
View File

@ -246,8 +246,16 @@ namespace DM_Weight.ViewModels
}
else
{
//msg.Add($"药品【{orderDetail.DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
msg.Add($"药品【{HasQChannels[0].DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
if (HasQChannels != null && HasQChannels.Count > 0 && HasQChannels[0].DrugInfo != null)
{
//msg.Add($"药品【{orderDetail.DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
msg.Add($"药品【{HasQChannels[0].DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
}
else
{
msg.Add($"药品【{orderDetail.DrugId}】库存不足，应取【{TakeQ}】库存【{total}】");
}
}
}
if (msg.Count > 0)