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

处方登录报表中数量取dm_machine_record表中的数量

This commit is contained in:
maqiao 2025-03-18 17:20:40 +08:00
parent 2d9d86443b
commit 76e25b979d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -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,dm.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,dm.ordinalNum as ordinalNum,CONCAT(DATE_FORMAT(operation_time,'%Y%m%d'),ordinalnum) as OrderOrdinal ,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,CONCAT(DATE_FORMAT(operation_time,'%Y%m%d'),ordinalnum) as OrderOrdinal
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

2
DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs
View File

@ -431,7 +431,7 @@ namespace DM_Weight.ViewModels
SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(), SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
ReceiveDept = OrderInfo[0].DeptName, ReceiveDept = OrderInfo[0].DeptName,
ReceivePerson = ReceivePerson, ReceivePerson = ReceivePerson,
OrdinalNum = ordinalNum + 1 OrdinalNum = ordinalNum<=0?1:ordinalNum+ 1
//,StockQuantity = nowChannels.Sum(it => it.Quantity) //,StockQuantity = nowChannels.Sum(it => it.Quantity)
}).ExecuteCommand(); }).ExecuteCommand();

2
DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
View File

@ -405,7 +405,7 @@ namespace DM_Weight.ViewModels
SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(), SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(),
ReceiveDept = OrderInfo.DeptName, ReceiveDept = OrderInfo.DeptName,
ReceivePerson = ReceivePerson, ReceivePerson = ReceivePerson,
OrdinalNum = ordinalNum + 1, OrdinalNum = ordinalNum<=0?1:ordinalNum+ 1,
}).ExecuteCommand(); }).ExecuteCommand();
} }
return true; return true;