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

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

This commit is contained in:
maqiao 2024-09-20 15:45:48 +08:00
parent a07091ea83
commit 748e5667c1
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/Models/RejectionReport.cs
View File

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

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -379,7 +379,7 @@ namespace DM_Weight.Report
SQL = $@" SQL = $@"
SELECT YEAR(operationtime) as DMYear,MONTH(operationtime) DMMonth,DAY(operationtime) DMDay, 0 as TotalBaseNum, 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(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 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' from rejection_report -- where DATE_FORMAT(operationtime,'%Y-%m-%d')= '2024-09-19'
GROUP BY Senddate,drugId order by Senddate,drugId"; GROUP BY Senddate,drugId order by Senddate,drugId";

8
DM_Weight/ReportTemp/use_jiaojie.grf
View File

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

4
DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
View File

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