临时提交

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<LjLogEntity>().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<LjLogEntity>().Where(x => (x.logtime >= starttime && x.logtime <= endtime) && x.valuekind == 4 && x.devicekind == 2).ToList();
 
             DataTableSum();

Main/MCEdit/Data/MCProject/nodeDataSource.xml

@@ -1,3 +1,3 @@
 <DataSources>
-  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="10" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
+  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="172.18.4.130" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="10" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
 </DataSources>