diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs index 67a9d80..483e95a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs @@ -167,6 +167,12 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo endtime = DateTime.Now.Date.AddHours(-5).AddMinutes(30); } + startDate.Value = Convert.ToDateTime(starttime.ToString("yyyy-MM-dd")); + endDate.Value = Convert.ToDateTime(endtime.ToString("yyyy-MM-dd")); + + startTime.Value = Convert.ToDateTime(starttime.ToString("HH:mm:ss")); + endTime.Value = Convert.ToDateTime(endtime.ToString("HH:mm:ss")); + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); @@ -193,6 +199,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo endtime = DateTime.Now.Date.AddHours(31).AddMinutes(30); } + startDate.Value = Convert.ToDateTime(starttime.ToString("yyyy-MM-dd")); + endDate.Value = Convert.ToDateTime(endtime.ToString("yyyy-MM-dd")); + + startTime.Value = Convert.ToDateTime(starttime.ToString("HH:mm:ss")); + endTime.Value = Convert.ToDateTime(endtime.ToString("HH:mm:ss")); + + list = FreeSqlUnit.Instance.Select().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList(); DataTableSum(); diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 8b8afb4..de0e88a 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