临时提交

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Service/CustomerService.cs

@@ -325,10 +325,10 @@ namespace SCADA_DAQ.Customer.Service
         {
             var startDayTime = DateTime.Parse(DateTime.Now.ToString("00:00:00"));
             var endDayTime = DateTime.Parse(DateTime.Now.ToString("23:59:59"));
-            OeeData = Env.SqlDAL.App_Vertiv_MachineInfo.GetData<MachineInfoModel>(t => t.CreateTime >= startDayTime & t.CreateTime <= endDayTime);
+            OeeData = Env.SqlDAL.App_Vertiv_MachineInfo.GetData<MachineInfoModel>(t => t.CreateTime >= startDayTime && t.CreateTime <= endDayTime);
         
             LastDeviceName = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>();
-            DailyOeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= startDayTime & t.CreateTime <= endDayTime);
+            DailyOeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= startDayTime && t.CreateTime <= endDayTime);
         }
 
         public string OeeValue { get; set; }

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/UctFrmBendDeviceOeeInformation.xaml.cs

@@ -79,7 +79,7 @@ namespace SCADA_DAQ.Customer
             Days = DateTimeHelper.GetDays(DateTimeHelper.ToMonthStart(DateTime.Now), DateTimeHelper.ToMonthEnd(DateTime.Now));
             var first = DateTime.Parse(Days.First().StartTime.ToString());
             var last = DateTime.Parse(Days.Last().EndTime.ToString());
-            OeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= first & t.CreateTime <= last);
+            OeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= first && t.CreateTime <= last);
 
 
         }

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/UctFrmDeviceOeeInformation.xaml.cs

@@ -132,7 +132,7 @@ namespace SCADA_DAQ.Customer
             Days = DateTimeHelper.GetDays(DateTimeHelper.ToMonthStart(DateTime.Now), DateTimeHelper.ToMonthEnd(DateTime.Now));
             var first = DateTime.Parse(Days.First().StartTime.ToString());
             var last = DateTime.Parse(Days.Last().EndTime.ToString());
-            OeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= first & t.CreateTime <= last);
+            OeeData = Env.SqlDAL.App_Vertiv_MachineInfoOeeData.GetData<OEEDataModel>(t => t.CreateTime >= first && t.CreateTime <= last);
 
 
         }