导出报表sql中添加厂家字段
This commit is contained in:
parent
cc88fca01d
commit
217dd11512
|
@ -302,7 +302,7 @@ namespace DM_Weight.Report
|
||||||
Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf");
|
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
|
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.drug_id,dm.receivePerson
|
,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,di.manuFactory,dm.receivePerson
|
||||||
from order_info oi inner join order_detail od on oi.order_no=od.Order_No
|
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
|
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}'";
|
||||||
|
|
Loading…
Reference in New Issue