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

还空瓶时写数量记录为记录行数量而不是归还的总数

This commit is contained in:
maqiao 2025-06-05 11:28:08 +08:00
parent c42c28125d
commit 3f95aeeab6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -346,7 +346,7 @@ namespace DM_Weight.Report
inner join drug_info di on dm.drug_id=di.drug_id
where dm.type=32 and dm.machine_id = '{p_machine_id}' and dm.operation_time>'{p_startDate}' and dm.operation_time<'{p_endDate}'";
SQL += " order by di.drug_iddm.operation_time,";
SQL += " order by di.drug_id,dm.operation_time";
Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
Report.DetailGrid.Recordset.QuerySQL = SQL;

2
DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
View File

@ -391,7 +391,7 @@ namespace DM_Weight.ViewModels
ReturnPerson = ReturnPerson,
ReceivePerson = ReceivePerson,
OperationTime = DateTime.Now,
Quantity = ReturnQuantity,
Quantity = _MachineRecord.Quantity, //ReturnQuantity,
Type = 32,
InvoiceId = _MachineRecord.InvoiceId, //InvoiceId,
GetId = _MachineRecord.Id,