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

处方账册中添加序号、处方序号字段

This commit is contained in:
maqiao 2025-03-14 14:04:10 +08:00
parent 18df517149
commit 784c1b0c0d
5 changed files with 76 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DM_Weight/Models/MachineRecord.cs
View File

@ -166,5 +166,10 @@ namespace DM_Weight.Models
/// </summary>
[SugarColumn(ColumnName = "receivePerson")]
public string ReceivePerson { get; set; }
/// <summary>
/// 序号
/// </summary>
[SugarColumn(ColumnName = "ordinalNum")]
public int OrdinalNum { get;set; }
}
}

6
DM_Weight/Report/GridReportUtil.cs
View File

@ -303,10 +303,12 @@ namespace DM_Weight.Report
Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf");
SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.patient_id,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName
,di.Drug_name,di.Drug_spec,di.big_unit,di.small_unit as smallUnit,di.drug_id,di.manuFactory,dm.receivePerson
,di.Drug_name,di.Drug_spec,di.big_unit,di.small_unit as smallUnit,di.drug_id,di.manuFactory,dm.receivePerson,dm.ordinalNum as ordinalNum,DATE_FORMAT(dm.operation_time,'%Y%m%d') as OrderOrdinal
from order_info oi inner join order_detail od on oi.order_no=od.Order_No
LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id
inner JOIN drug_info di on od.drug_id=di.drug_id left join user_list ul on dm.operator=ul.id left join user_list ul2 on dm.reviewer=ul2.id WHERE dm.machine_id = '{p_machine_id}' and oi.recv_date>'{p_startDate}' and oi.recv_date<'{p_endDate}'";
inner JOIN drug_info di on od.drug_id=di.drug_id left join user_list ul on dm.operator=ul.id
left join user_list ul2 on dm.reviewer=ul2.id
WHERE dm.machine_id = '{p_machine_id}' and oi.recv_date>'{p_startDate}' and oi.recv_date<'{p_endDate}'";
if (!string.IsNullOrEmpty(orderNo))
{
SQL += $" and oi.order_no='{orderNo}'";

54
DM_Weight/ReportTemp/account_book_order.grf
View File

@ -114,10 +114,26 @@
{
"Name":"单位",
"DBFieldName":"smallUnit"
},
{
"Name":"序号",
"DBFieldName":"ordinalNum"
},
{
"Name":"处方编号",
"DBFieldName":"OrderOrdinal"
}
]
},
"Column":[
{
"Name":"序号",
"Width":0.767292
},
{
"Name":"处方编号",
"Width":2.59292
},
{
"Name":"处方日期",
"Width":1.98438
@ -178,6 +194,16 @@
"ColumnContent":{
"Height":0.85,
"ColumnContentCell":[
{
"Column":"序号",
"TextAlign":"MiddleCenter",
"DataField":"序号"
},
{
"Column":"处方编号",
"TextAlign":"MiddleCenter",
"DataField":"处方编号"
},
{
"Column":"处方日期",
"TextAlign":"MiddleCenter",
@ -282,6 +308,30 @@
"Height":1.19063,
"RepeatStyle":"OnGroupHeaderPage",
"ColumnTitleCell":[
{
"GroupTitle":false,
"Column":"序号",
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"序\r\n号"
},
{
"GroupTitle":false,
"Column":"处方编号",
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"处方编号"
},
{
"GroupTitle":false,
"Column":"处方日期",
@ -621,14 +671,14 @@
"Name":"Line1",
"Anchor":"[Left|Top|Right]",
"Top":2.6,
"Width":28
"Width":31.2473
},
{
"Type":"Line",
"Name":"Line2",
"Anchor":"[Left|Top|Right]",
"Top":2.68,
"Width":28
"Width":31.2473
}
]
},

11
DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
View File

@ -259,7 +259,7 @@ namespace DM_Weight.ViewModels
}
else
{
if (HasQChannels != null && HasQChannels.Count>0 && HasQChannels[0].DrugInfo != null)
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}】");
@ -363,6 +363,8 @@ namespace DM_Weight.ViewModels
if (OrderInfo.Count > 0)
{
for (int j = 0; j < OrderInfo.Count; j++)
{
string InvoiceId = OrderInfo[j].OrderNo;
@ -384,6 +386,9 @@ namespace DM_Weight.ViewModels
});
for (int i = 0; i < record.Count; i++)
{
int ordinalNum = SqlSugarHelper.Db.Queryable<MachineRecord>()
.Where(mr => mr.OperationTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
.Max(mr => mr.OrdinalNum);
List<OrderDetail> orderDet = SqlSugarHelper.Db.Queryable<OrderDetail>().Where(od => od.OrderNo == OrderInfo[j].OrderNo && od.DrugId == record[i].DrugId).ToList();
//该对方没有这个药，跳出循环
@ -425,8 +430,10 @@ namespace DM_Weight.ViewModels
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
ReceiveDept = OrderInfo[0].DeptName,
ReceivePerson = ReceivePerson
ReceivePerson = ReceivePerson,
OrdinalNum = ordinalNum + 1
//,StockQuantity = nowChannels.Sum(it => it.Quantity)
}).ExecuteCommand();
}
//更新处方状态

7
DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
View File

@ -345,6 +345,7 @@ namespace DM_Weight.ViewModels
List<ChannelStock> record = ChannelStocks.FindAll(it => it.TakeQuantity > 0).ToList();
if (record.Count > 0)
{
string InvoiceId = OrderInfo.OrderNo;
var f = SqlSugarHelper.Db.UseTran(() =>
{
@ -365,6 +366,9 @@ namespace DM_Weight.ViewModels
for (int i = 0; i < record.Count; i++)
{
int ordinalNum = SqlSugarHelper.Db.Queryable<MachineRecord>()
.Where(mr => mr.OperationTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
.Max(mr => mr.OrdinalNum);
ChannelStock it = record[i];
// 更新数据 库存信息
SqlSugarHelper.Db.Updateable(new ChannelStock()
@ -400,7 +404,8 @@ namespace DM_Weight.ViewModels
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
ReceiveDept = OrderInfo.DeptName,
ReceivePerson=ReceivePerson
ReceivePerson = ReceivePerson,
OrdinalNum = ordinalNum + 1,
}).ExecuteCommand();
}
return true;