From 2c4267d100122ada08a0a693b9c7a19d50a434bd Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Fri, 20 Sep 2024 15:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B5=8B=E5=80=BC=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckOrderNewWindowViewModel.cs | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index aea5c09..f599d95 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -502,12 +502,13 @@ namespace DM_Weight.ViewModels for (int j = 0; j < oi.OrderDetailList.Count; j++) { oi._OrderDetail = oi.OrderDetailList[j]; + int drawerNo= DrawerNo+1; ChannelStock cs = SqlSugarHelper.Db.Queryable() .Where(cs => cs.DrugId == oi._OrderDetail.DrugId && cs.ManuNo == oi._OrderDetail.SetManuNo && cs.EffDate == oi._OrderDetail.SetEffDate && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") - && cs.DrawerNo == DrawerNo+1).First(); + && cs.DrawerNo == drawerNo).First(); if (cs == null) { empChannelStock += $"{oi.OrderNo},{oi._OrderDetail.DrugId},{oi._OrderDetail.SetManuNo},{oi._OrderDetail.SetEffDate};"; @@ -539,31 +540,34 @@ namespace DM_Weight.ViewModels #region 记录 注射剂使用与交接记录报表 //查询发药时间 - MachineRecord SendMachineRecord = SqlSugarHelper.Db.Queryable().Where(mr => mr.DrawerNo == cs.DrawerNo && mr.Type == 2) - .OrderByDescending(mr => mr.OperationTime) - .First(); - string retUser = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cl.DrawerNo == cs.DrawerNo) - .Select(cl => cl.BelongUser).First(); + //MachineRecord SendMachineRecord = SqlSugarHelper.Db.Queryable().Where(mr => mr.DrawerNo == cs.DrawerNo && mr.Type == 2) + //.OrderByDescending(mr => mr.OperationTime) + //.First(); + //string retUser = SqlSugarHelper.Db.Queryable().Where(cl => cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cl.DrawerNo == cs.DrawerNo) + //.Select(cl => cl.BelongUser).First(); + + RejectionReport rejectionReport = SqlSugarHelper.Db.Queryable().Where(rp => rp.DrugId == cs.DrugId && rp.DrawerNo == cs.DrawerNo).OrderByDescending(rp=>rp.SendDate).First(); + //发药信息 - RejectionReport rejectionReport = new RejectionReport(); - rejectionReport.SendDate = SendMachineRecord.OperationTime; - rejectionReport.SendUser = SendMachineRecord.Operator.ToString(); - rejectionReport.ReceiveUser = retUser; + //RejectionReport rejectionReport = new RejectionReport(); + //rejectionReport.SendDate = SendMachineRecord.OperationTime; + //rejectionReport.SendUser = SendMachineRecord.Operator.ToString(); + //rejectionReport.ReceiveUser = retUser; rejectionReport.RealNum = cs.BaseQuantity; //还药信息 rejectionReport.InfactNum = cs.BaseQuantity - oi._OrderDetail.Quantity; rejectionReport.EmptyNum = oi._OrderDetail.Quantity; rejectionReport.ReturnTime = DateTime.Now; - rejectionReport.ReturnUser = retUser; - rejectionReport.ReturnReceiveUser = SendMachineRecord.Operator.ToString(); + rejectionReport.ReturnUser = rejectionReport.SendUser; + rejectionReport.ReturnReceiveUser = rejectionReport.ReceiveUser;// SendMachineRecord.Operator.ToString(); rejectionReport.DrugId = oi._OrderDetail.DrugId; rejectionReport.DrugName = oi._OrderDetail.DrugInfo.DrugName; rejectionReport.DrugSpec = oi._OrderDetail.DrugInfo.DrugSpec; rejectionReport.OperationTime = DateTime.Now; - int iRejectionReport = SqlSugarHelper.Db.Insertable(rejectionReport).ExecuteCommand(); + int iRejectionReport = SqlSugarHelper.Db.Updateable(rejectionReport).ExecuteCommand(); #endregion