From ece3d477a254860c8ba0a295a59949f3c389fdb3 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 19 Sep 2024 11:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=B0=84=E5=89=82?=
=?UTF-8?q?=E6=8A=A5=E8=A1=A8model=E5=B9=B6=E5=9C=A8=E6=A0=B8=E5=AF=B9?=
=?UTF-8?q?=E5=A4=84=E6=96=B9=E6=97=B6=E5=86=99=E5=85=A5=E8=A1=A8=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/Models/RejectionReport.cs | 102 ++++++++++++++++++
.../CheckOrderNewWindowViewModel.cs | 36 ++++++-
2 files changed, 135 insertions(+), 3 deletions(-)
create mode 100644 DM_Weight/Models/RejectionReport.cs
diff --git a/DM_Weight/Models/RejectionReport.cs b/DM_Weight/Models/RejectionReport.cs
new file mode 100644
index 0000000..4d7d7ae
--- /dev/null
+++ b/DM_Weight/Models/RejectionReport.cs
@@ -0,0 +1,102 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+ [SugarTable("rejection_report")]
+ public class RejectionReport
+ {
+ ///
+ /// 主键
+ ///
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public int Id { get; set; }
+ ///
+ /// 发药时间
+ ///
+ [SugarColumn(ColumnName = "SendDate")]
+ public DateTime SendDate { get; set; }
+ ///
+ /// 发药者
+ ///
+ [SugarColumn(ColumnName = "SendUser")]
+ public string SendUser { get;set; }
+ ///
+ /// 领药者
+ ///
+ [SugarColumn(ColumnName = "ReceiveUser")]
+ public string ReceiveUser { get; set; }
+ ///
+ /// 实发数
+ ///
+ [SugarColumn(ColumnName = "RealNum")]
+ public int RealNum { get;set; }
+ ///
+ /// 实物数
+ ///
+ [SugarColumn(ColumnName = "InfactNum")]
+ public int InfactNum { get; set; }
+ ///
+ /// 空安瓿
+ ///
+ [SugarColumn(ColumnName = "EmptyNum")]
+ public int EmptyNum { get; set; }
+ ///
+ /// 还药时间
+ ///
+ [SugarColumn(ColumnName = "ReturnTime")]
+ public DateTime ReturnTime { get; set; }
+ ///
+ /// 还药者
+ ///
+ [SugarColumn(ColumnName = "ReturnUser")]
+ public string ReturnUser { get; set; }
+ ///
+ /// 接收者
+ ///
+ [SugarColumn(ColumnName = "ReturnReceiveUser")]
+ public string ReturnReceiveUser { get;set; }
+ ///
+ /// 补充者
+ ///
+ [SugarColumn(ColumnName = "AddUser")]
+ public string AddUser { get; set; }
+ ///
+ /// 核对者
+ ///
+ [SugarColumn(ColumnName = "AddCheckUser")]
+ public string AddCheckUser { get; set; }
+ ///
+ /// 操作时间
+ ///
+ [SugarColumn(ColumnName = "OperationTime")]
+ public DateTime OperationTime { get; set; }
+ [SugarColumn(ColumnName = "DrugId")]
+ public string DrugId { get; set; }
+
+ ///
+ /// 药品名称
+ ///
+ [SugarColumn(ColumnName = "DrugName")]
+ public string DrugName { get; set;}
+ ///
+ /// 药品规格
+ ///
+ [SugarColumn(ColumnName = "DrugSpec")]
+ public string DrugSpec { get;set; }
+ ///
+ /// 总基数
+ ///
+ [SugarColumn(ColumnName = "BaseNum")]
+ public string BaseNum { get; set; }
+ ///
+ /// 药箱号
+ ///
+ [SugarColumn(ColumnName = "DrawerNo")]
+ public int DrawerNo { get; set; }
+ }
+}
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 735da52..5e7e533 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -499,7 +499,12 @@ namespace DM_Weight.ViewModels
//Expression> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
- 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).First();
+ 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).First();
if (cs == null)
{
empChannelStock += $"{oi.OrderNo},{oi._OrderDetail.DrugId},{oi._OrderDetail.SetManuNo},{oi._OrderDetail.SetEffDate}";
@@ -530,8 +535,33 @@ namespace DM_Weight.ViewModels
}).ExecuteCommand();
#region 记录 注射剂使用与交接记录报表
- //1查询取走药箱时间
- DateTime? strEffDate= SqlSugarHelper.Db.Queryable().Where(mr => mr.DrawerNo == cs.DrawerNo && mr.Type == 55 && mr.OptionType == 0).Select(mr => mr.EffDate).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 = 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.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();
+
#endregion
}