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

DM_Weight/App.config

@@ -28,7 +28,7 @@
 		<!-- 自动退出时间，单位秒，为0时不自动退出 -->
 		<add key="autoExit" value="0"/>
 		<!--报表数据库连接-->
-		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang2; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->

DM_Weight/Report/GridReportUtil.cs

@@ -347,7 +347,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 dm.operation_time,di.drug_id";
+            SQL += " order by di.drug_id,dm.operation_time";
 
             Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
             Report.DetailGrid.Recordset.QuerySQL = SQL;

DM_Weight/ReportTemp/return_empty.grf

@@ -72,7 +72,7 @@
 			},
 			{
 				"Name":"患者姓名",
-				"Width":3.78354
+				"Width":1.98438
 			},
 			{
 				"Name":"使用科室",
@@ -84,7 +84,7 @@
 			},
 			{
 				"Name":"批次",
-				"Width":1.79917
+				"Width":3.20146
 			},
 			{
 				"Name":"交回人",
@@ -96,7 +96,7 @@
 			}
 		],
 		"ColumnContent":{
-			"Height":4.78896,
+			"Height":1.19063,
 			"ColumnContentCell":[
 				{
 					"Column":"Column2",
@@ -137,7 +137,7 @@
 		},
 		"ColumnTitle":{
 			"Height":1.40229,
-			"RepeatStyle":"OnPage",
+			"RepeatStyle":"OnGroupHeaderPage",
 			"ColumnTitleCell":[
 				{
 					"GroupTitle":true,
@@ -253,6 +253,7 @@
 				"Name":"Group2",
 				"ByFields":"drug_id",
 				"GroupHeader":{
+					"NewPage":"Before",
 					"PrintGridBorder":false,
 					"RepeatOnPage":true,
 					"Control":[

DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs

@@ -397,7 +397,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,