From 748e5667c1f4da3309083b50976ef1ff03638e0c Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 20 Sep 2024 15:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E5=8F=8A=E6=8A=A5=E8=A1=A8=E4=B8=ADreturntime?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BAstring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/Models/RejectionReport.cs | 2 +-
DM_Weight/Report/GridReportUtil.cs | 2 +-
DM_Weight/ReportTemp/use_jiaojie.grf | 8 ++++----
DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs | 4 +++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/DM_Weight/Models/RejectionReport.cs b/DM_Weight/Models/RejectionReport.cs
index 76b26a0..f01cda4 100644
--- a/DM_Weight/Models/RejectionReport.cs
+++ b/DM_Weight/Models/RejectionReport.cs
@@ -49,7 +49,7 @@ namespace DM_Weight.Models
/// 还药时间
///
[SugarColumn(ColumnName = "ReturnTime")]
- public DateTime ReturnTime { get; set; }
+ public string ReturnTime { get; set; }
///
/// 还药者
///
diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 6f94c06..1d8f3f1 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/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";
diff --git a/DM_Weight/ReportTemp/use_jiaojie.grf b/DM_Weight/ReportTemp/use_jiaojie.grf
index 7dde8c3..27b1a7f 100644
--- a/DM_Weight/ReportTemp/use_jiaojie.grf
+++ b/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
}
diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index e2e505e..4e355c0 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -397,13 +397,15 @@ namespace DM_Weight.ViewModels
string belognUser = SqlSugarHelper.Db.Queryable().
Where(cl => cl.DrawerNo == jStock.DrawerNo && cl.MachineId == jStock.MachineId).Select(cl => cl.BelongUser).First();
-
+ DrugInfo di = SqlSugarHelper.Db.Queryable().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();