From 0fedeb7f47a59bf9a73ee5480e7456b918dfc5c2 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 20 Sep 2024 13:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0RejectionReport=E5=AE=9E?=
=?UTF-8?q?=E4=BD=93=EF=BC=8C=E5=B9=B6=E5=9C=A8=E5=AE=8C=E6=88=90=E8=A1=A5?=
=?UTF-8?q?=E8=8D=AF=E6=97=B6=E5=86=99=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/Models/ChannelList.cs | 7 ++
DM_Weight/Models/RejectionReport.cs | 104 ++++++++++++++++++
.../ViewModels/AddToJiaoJieDialogViewModel.cs | 34 ++++--
3 files changed, 138 insertions(+), 7 deletions(-)
create mode 100644 DM_Weight/Models/RejectionReport.cs
diff --git a/DM_Weight/Models/ChannelList.cs b/DM_Weight/Models/ChannelList.cs
index 81f1e4a..d7aabbe 100644
--- a/DM_Weight/Models/ChannelList.cs
+++ b/DM_Weight/Models/ChannelList.cs
@@ -196,5 +196,12 @@ namespace DM_Weight.Models
private string _drugSpec;
[SugarColumn(ColumnName = "drug_manu_no")]
public string DrugSpec { get=> _drugSpec;set=>SetProperty(ref _drugSpec, value); }
+
+
+ [SugarColumn(ColumnName = "yh_no")]
+ public string BelongUser
+ {
+ get; set;
+ }
}
}
diff --git a/DM_Weight/Models/RejectionReport.cs b/DM_Weight/Models/RejectionReport.cs
new file mode 100644
index 0000000..76b26a0
--- /dev/null
+++ b/DM_Weight/Models/RejectionReport.cs
@@ -0,0 +1,104 @@
+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/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index cbdc2e8..beba1c6 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -23,7 +23,7 @@ namespace DM_Weight.ViewModels
private readonly ILog logger = LogManager.GetLogger(typeof(OrderTakeDialogViewModel));
- private List _channelStocks=new List();
+ private List _channelStocks = new List();
public List ChannelStocks
{
@@ -198,7 +198,7 @@ namespace DM_Weight.ViewModels
.OrderBy(cs => cs.EffDate)
.OrderBy(cs => cs.DrawerNo)
.ToList();
- if(HasQChannels==null|| HasQChannels.Count <= 0)
+ if (HasQChannels == null || HasQChannels.Count <= 0)
{
msg.Add($"有药品未绑定，请先绑定");
continue;
@@ -352,8 +352,8 @@ namespace DM_Weight.ViewModels
}).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
//更新 交接柜 库存信息
- List jiaojie = Jiaojie_ChannelStocks.Where(cs=>cs.DrugId== it.DrugId).ToList();
- if(jiaojie!=null&&jiaojie.Count>0)
+ List jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList();
+ if (jiaojie != null && jiaojie.Count > 0)
{
for (int j = 0; j < jiaojie.Count; j++)
{
@@ -365,9 +365,9 @@ namespace DM_Weight.ViewModels
//ManuNo = it.ManuNo,
//EffDate = it.EffDate,
Id = jiaojie_it.Id,
- }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity}).ExecuteCommand();
+ }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand();
}
- }
+ }
// 保存数据 出库记录
@@ -384,10 +384,30 @@ namespace DM_Weight.ViewModels
OperationTime = DateTime.Now,
Quantity = it.TakeQuantity,
Type = 2,
- Status= 2,//给交接柜补药不用还空瓶，等真正用了以后再还空瓶，所以先把状态置为2
+ Status = 2,//给交接柜补药不用还空瓶，等真正用了以后再还空瓶，所以先把状态置为2
InvoiceId = InvoiceId
}).ExecuteCommand();
}
+ //保存注射剂报表信息
+ for (int j = 0; j < Jiaojie_ChannelStocks.Count; j++)
+ {
+ ChannelStock jStock = Jiaojie_ChannelStocks[j];
+ int totalBaseNum = SqlSugarHelper.Db.Queryable().
+ Where(db => db.DrugId == jStock.DrugId && db.MachineId == jStock.MachineId).Select(db => db.BaseQuantity).First();
+
+ string belognUser = SqlSugarHelper.Db.Queryable().
+ Where(cl => cl.DrawerNo == jStock.DrawerNo && cl.MachineId == jStock.MachineId).Select(cl => cl.BelongUser).First();
+
+ SqlSugarHelper.Db.Insertable(new RejectionReport()
+ {
+ SendDate = System.DateTime.Now,
+ SendUser = HomeWindowViewModel.Operator?.Nickname,
+ ReceiveUser = belognUser,//Jiaojie_ChannelStocks
+ DrugId = jStock.DrugId,
+ BaseNum = totalBaseNum + "支",//总基数
+ DrawerNo = jStock.DrawerNo,
+ }).ExecuteCommand();
+ }
return true;
});
if (f.Data)