处方登记账册添加序号与处方编号
This commit is contained in:
parent
c9480a5c0d
commit
1dfe608a83
|
|
@ -166,5 +166,8 @@ namespace DM_Weight.Models
|
|||
/// </summary>
|
||||
[SugarColumn(ColumnName = "receivePerson")]
|
||||
public string ReceivePerson { get; set; }
|
||||
|
||||
[SugarColumn(ColumnName = "ordinalNum")]
|
||||
public int OrdinalNum { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -303,10 +303,11 @@ 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.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,dm.receivePerson,di.manuFactory,patient_card
|
||||
,di.Drug_name,di.Drug_spec,di.big_unit,di.small_unit as smallUnit,di.drug_id,dm.receivePerson,di.manuFactory,patient_card,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}' and dm.type=2 ";
|
||||
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}' and dm.type=2 ";
|
||||
if (!string.IsNullOrEmpty(orderNo))
|
||||
{
|
||||
SQL += $" and oi.order_no='{orderNo}'";
|
||||
|
|
|
|||
|
|
@ -114,10 +114,24 @@
|
|||
{
|
||||
"Name":"单位",
|
||||
"DBFieldName":"unit"
|
||||
},
|
||||
{
|
||||
"Name":"序号",
|
||||
"DBFieldName":"ordinalNum"
|
||||
},
|
||||
{
|
||||
"Name":"处方编号",
|
||||
"DBFieldName":"OrderOrdinal"
|
||||
}
|
||||
]
|
||||
},
|
||||
"Column":[
|
||||
{
|
||||
"Name":"序号"
|
||||
},
|
||||
{
|
||||
"Name":"处方编号"
|
||||
},
|
||||
{
|
||||
"Name":"处方日期",
|
||||
"Width":1.98438
|
||||
|
|
@ -178,6 +192,16 @@
|
|||
"ColumnContent":{
|
||||
"Height":0.85,
|
||||
"ColumnContentCell":[
|
||||
{
|
||||
"Column":"序号",
|
||||
"TextAlign":"MiddleCenter",
|
||||
"DataField":"序号"
|
||||
},
|
||||
{
|
||||
"Column":"处方编号",
|
||||
"TextAlign":"MiddleCenter",
|
||||
"DataField":"处方编号"
|
||||
},
|
||||
{
|
||||
"Column":"处方日期",
|
||||
"TextAlign":"MiddleCenter",
|
||||
|
|
@ -282,6 +306,30 @@
|
|||
"Height":1.19063,
|
||||
"RepeatStyle":"OnGroupHeaderPage",
|
||||
"ColumnTitleCell":[
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"序号",
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":105000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"序号"
|
||||
},
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"处方编号",
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":105000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"处方编号"
|
||||
},
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"处方日期",
|
||||
|
|
@ -621,14 +669,14 @@
|
|||
"Name":"Line1",
|
||||
"Anchor":"[Left|Top|Right]",
|
||||
"Top":2.6,
|
||||
"Width":28
|
||||
"Width":33.8667
|
||||
},
|
||||
{
|
||||
"Type":"Line",
|
||||
"Name":"Line2",
|
||||
"Anchor":"[Left|Top|Right]",
|
||||
"Top":2.68,
|
||||
"Width":28
|
||||
"Width":33.8667
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -371,7 +371,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();
|
||||
//该对方没有这个药，跳出循环
|
||||
if (orderDet == null || orderDet.Count <= 0)
|
||||
|
|
@ -407,7 +409,8 @@ namespace DM_Weight.ViewModels
|
|||
OperationTime = DateTime.Now,
|
||||
Quantity = orderTakeQuantity,
|
||||
Type = 2,
|
||||
InvoiceId = InvoiceId
|
||||
InvoiceId = InvoiceId,
|
||||
OrdinalNum = ordinalNum + 1
|
||||
//,StockQuantity = nowChannels.Sum(it => it.Quantity)
|
||||
}).ExecuteCommand();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -365,6 +365,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")&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
|
||||
.Max(mr => mr.OrdinalNum);
|
||||
ChannelStock it = record[i];
|
||||
// 更新数据 库存信息
|
||||
SqlSugarHelper.Db.Updateable(new ChannelStock()
|
||||
|
|
@ -400,7 +403,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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue