From dadf5d47c09aa84e75fab8bd0be7a6cfa5b1efc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= <nodyang@qq.com>
Date: Tue, 20 Feb 2024 12:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjReport/DayWhiteEmbryo/GelBlackPowderCount.cs  | 13 +++++++++++++
 Main/MCEdit/Data/MCProject/nodeDataSource.xml       |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

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<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();
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 @@
 <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>
\ No newline at end of file