From 3f95aeeab6e8949cdf521b90541b194f8d2c6756 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Thu, 5 Jun 2025 11:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E7=A9=BA=E7=93=B6=E6=97=B6=E5=86=99?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=B0=E5=BD=95=E4=B8=BA=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E9=87=8F=E8=80=8C=E4=B8=8D=E6=98=AF=E5=BD=92?= =?UTF-8?q?=E8=BF=98=E7=9A=84=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Report/GridReportUtil.cs | 2 +- DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs index 7efcfce..defe82f 100644 --- a/DM_Weight/Report/GridReportUtil.cs +++ b/DM_Weight/Report/GridReportUtil.cs @@ -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; diff --git a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs index dfed495..0f2cb86 100644 --- a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs +++ b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs @@ -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,