修改报表字段及报表中returntime类型为string

DM_Weight/Models/RejectionReport.cs

@@ -49,7 +49,7 @@ namespace DM_Weight.Models
         /// 还药时间
         /// </summary>
         [SugarColumn(ColumnName = "ReturnTime")]
-        public DateTime ReturnTime { get; set; }
+        public string ReturnTime { get; set; }
         /// <summary>
         /// 还药者
         /// </summary>

DM_Weight/Report/GridReportUtil.cs

@@ -379,7 +379,7 @@ namespace DM_Weight.Report
             SQL = $@" 
                     SELECT YEAR(operationtime) as DMYear,MONTH(operationtime) DMMonth,DAY(operationtime) DMDay, 0 as TotalBaseNum,
                     DATE_FORMAT(Senddate,'%Y/%m/%d %H:%i:%s') as Senddate,SendUser as SendUser,receiveuser as ReceiveUser,realnum as SendNum,infactnum as InfactNum,emptynum as EmptyNum,
-                    DATE_FORMAT(returntime,'%Y/%m/%d %H:%i:%s') as ReturnTime,returnuser as ReturnUser,returnreceiveuser as ReturnReceiveUser, 
+                    DATE_FORMAT(returntime,'%Y/%m/%d %H:%i:%s') as ReturnDate,returnuser as ReturnUser,returnreceiveuser as ReturnReceiveUser, 
                     adduser as AddUser,addcheckuser as AddCheckUser,DATE_FORMAT(operationtime,'%Y/%m/%d %H:%i:%s') as OperationTime,drugid as drugId,drugname as drugName,drugspec,basenum as TotalNum,drawerno
                     from rejection_report -- where DATE_FORMAT(operationtime,'%Y-%m-%d')= '2024-09-19'
                     GROUP BY Senddate,drugId order by Senddate,drugId";

DM_Weight/ReportTemp/use_jiaojie.grf

@@ -33,8 +33,7 @@
 					"Type":"Integer"
 				},
 				{
-					"Name":"TotalNum",
-					"Type":"Integer"
+					"Name":"TotalNum"
 				},
 				{
 					"Name":"Senddate",
@@ -156,7 +155,7 @@
 				{
 					"Column":"Column36",
 					"TextAlign":"MiddleCenter",
-					"DataField":"DMYear"
+					"DataField":"ReturnTime"
 				},
 				{
 					"Column":"Column23",
@@ -165,6 +164,7 @@
 				},
 				{
 					"Column":"Column24",
+					"TextAlign":"MiddleCenter",
 					"DataField":"ReturnReceiveUser"
 				}
 			]
@@ -517,7 +517,7 @@
 		"CrossTab":{
 			"PercentFormat":"0.##%",
 			"HCrossFields":"drugId",
-			"VCrossFields":"Senddate",
+			"VCrossFields":"Senddate;drawerno",
 			"ListCols":3,
 			"TotalCols":3
 		}

DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs

@@ -397,13 +397,15 @@ namespace DM_Weight.ViewModels
 
                                 string belognUser = SqlSugarHelper.Db.Queryable<ChannelList>().
                                                     Where(cl => cl.DrawerNo == jStock.DrawerNo && cl.MachineId == jStock.MachineId).Select(cl => cl.BelongUser).First();
-
+                                DrugInfo di = SqlSugarHelper.Db.Queryable<DrugInfo>().Where(di => di.DrugId == jStock.DrugId).First();
                                 SqlSugarHelper.Db.Insertable(new RejectionReport()
                                 {
                                     SendDate =DateTime.Parse(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm")),
                                     SendUser = HomeWindowViewModel.Operator?.Nickname,
                                     ReceiveUser = belognUser,//Jiaojie_ChannelStocks
                                     DrugId = jStock.DrugId,
+                                    DrugName=di.DrugName,
+                                    DrugSpec=di.DrugSpec,
                                     BaseNum = totalBaseNum + "支",//总基数
                                     DrawerNo = jStock.DrawerNo
                                 }).ExecuteCommand();