diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs index caa15f1..2a7d52c 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs @@ -1,4 +1,5 @@ using DevExpress.Xpo.Helpers; +using DevExpress.XtraRichEdit.Model; using FastReport.Dialog; @@ -53,7 +54,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo endTime = control.FirstOrDefault(x => x.Name == "endTime") as MCDateTimePicker; dataGridView.AutoGenerateColumns = true; mCDateTimePicker.Value = DateTime.Now.AddDays(0); - startDate.Value = DateTime.Now.AddDays(-3); + startDate.Value = DateTime.Now.AddDays(-1); + + startTime.Value = Convert.ToDateTime(DateTime.Now.ToString("08:00:00")); + + + endTime.Value = Convert.ToDateTime(DateTime.Now.ToString("20:00:00")); dt = new DataTable(); dt.Columns.Add("机台", typeof(string)); diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 3600a0d..3c73a6a 100644 --- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml +++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml index 4d9f448..2c5a2d0 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml @@ -25,6 +25,7 @@ None True True + False False 349, 12 MoreData