From f18655cc805583a3adfb5bafa4da0b9ab1a89c40 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Fri, 20 Sep 2024 15:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E8=BF=98=E8=8D=AF=E6=97=B6=E9=97=B4=E4=B8=BA=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/Models/RejectionReport.cs | 2 +- DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DM_Weight/Models/RejectionReport.cs b/DM_Weight/Models/RejectionReport.cs index 4d7d7ae..75455c9 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/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs index f599d95..86b0604 100644 --- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs +++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs @@ -558,7 +558,7 @@ namespace DM_Weight.ViewModels //还药信息 rejectionReport.InfactNum = cs.BaseQuantity - oi._OrderDetail.Quantity; rejectionReport.EmptyNum = oi._OrderDetail.Quantity; - rejectionReport.ReturnTime = DateTime.Now; + rejectionReport.ReturnTime = DateTime.Now.ToString(); rejectionReport.ReturnUser = rejectionReport.SendUser; rejectionReport.ReturnReceiveUser = rejectionReport.ReceiveUser;// SendMachineRecord.Operator.ToString(); rejectionReport.DrugId = oi._OrderDetail.DrugId;