From 96e79b25145325dfed551b9c422eb37388f8cf05 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Fri, 6 Dec 2024 18:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E4=B8=93=E7=94=A8=E8=B4=A6?= =?UTF-8?q?=E5=86=8C=E6=B7=BB=E5=8A=A0=E6=8C=89=E5=A4=84=E6=96=B9=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=97=B6=E5=80=BC=E7=8F=AD=E7=9B=98=E7=82=B9=E5=80=BC?= =?UTF-8?q?=E7=8F=AD=EF=BC=8C=E5=91=A8=E8=BD=AC=E7=9B=98=E7=82=B9=E5=91=A8?= =?UTF-8?q?=E8=BD=AC=EF=BC=8C=E7=9B=98=E7=82=B9=E8=AE=B0=E5=BD=95=E5=88=86?= =?UTF-8?q?=E5=88=AB=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Report/GridReportUtil.cs | 2 +- DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs | 2 +- .../ViewModels/CheckRecordDetailDialogViewModel.cs | 4 +++- DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs | 9 +++++++++ .../ViewModels/MultiOrderTakeDialogViewModel.cs | 12 ++++++++++-- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs index 47ca668..2a3dd77 100644 --- a/DM_Weight/Report/GridReportUtil.cs +++ b/DM_Weight/Report/GridReportUtil.cs @@ -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; diff --git a/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs b/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs index 037030e..50e45e5 100644 --- a/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs +++ b/DM_Weight/ViewModels/ChangeShiftsDialogViewModel.cs @@ -642,7 +642,7 @@ namespace DM_Weight.ViewModels private HkcChangeShifts GetOperator() { //查询发药人及审核人 - HkcChangeShifts changeOperator = SqlSugarHelper.Db.Queryable().Single(change => change.State == "0"); + HkcChangeShifts changeOperator = SqlSugarHelper.Db.Queryable().Single(change => change.Machineid == (ConfigurationManager.AppSettings["machineId"] ?? "DM1") && change.State == "0"); //if (changeOperator != null) //{ // Operator = SqlSugarHelper.Db.Queryable().Single(u => u.UserName == changeOperator.FromOperator); diff --git a/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs b/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs index f2add79..c3808a9 100644 --- a/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs +++ b/DM_Weight/ViewModels/CheckRecordDetailDialogViewModel.cs @@ -158,7 +158,9 @@ namespace DM_Weight.ViewModels //strSql += " GROUP BY C.optdate,Drug_id ORDER BY C.OPTDATE DESC"; List checkList = SqlSugarHelper.Db.Queryable() .Includes(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(checkList); diff --git a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs index 40c4bb4..10cb57e 100644 --- a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs @@ -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 checkRecordStockList = SqlSugarHelper.Db.SqlQueryable(strSql) .AddParameters(new { diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs index ccd3e7e..3c2d77a 100644 --- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs +++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs @@ -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)