From f815fe9bca455443f33082390bae5c70d96ecbb4 Mon Sep 17 00:00:00 2001
From: nodyang <yangw@outlook.com>
Date: Fri, 13 Oct 2023 09:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LjReport/DayWhiteEmbryo/DayWhiteEmbryoInitDb.cs       | 8 +++++++-
 Main/MCEdit/Data/MCProject/nodeDataSource.xml             | 2 +-
 .../MCEdit/Data/MCProject/nodeForm/FormDayWhiteEmbryo.xml | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

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 @@
 <DataSources>
-  <DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" 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="192.168.0.100" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" 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
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 @@
       <Property name="DbOptionType">None</Property>
       <Property name="MCVisible">True</Property>
       <Property name="MCEnabled">True</Property>
+      <Property name="AutoGenerateColumns">False</Property>
       <Property name="MultiSelect">False</Property>
       <Property name="Location">349, 12</Property>
       <Property name="Name">MoreData</Property>