Merge branch 'master' of http://139.155.15.221:3000/zoulei/DW5S

DW5S.App/EditForms/TaskEditor.cs

@@ -1,35 +1,14 @@
-using DevExpress.Utils.About;
-using DevExpress.Utils.Extensions;
-using DevExpress.XtraBars.Customization;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.ButtonsPanelControl;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraEditors.DXErrorProvider;
-using DevExpress.XtraPrinting.Native;
-using DxHelper;
+using DevExpress.XtraEditors;
+using DW5S.Entity;
+using DW5S.Repostory;
+using DW5S.ViewModel;
 using ExtensionsDev;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Documents;
 using System.Windows.Forms;
-using DW5S.DTO;
-using DW5S.Entity;
-using DW5S.Repostory;
-using Serilog;
-using DW5S.Service;
-using DW5S.ViewModel;
 using XdCxRhDW5S.ViewModel;
-using DevExpress.XtraCharts.Native;
-using DevExpress.Data.Mask.Internal;
 
 namespace DW5S.App.EditForms
 {

DW5S.App/UserControl/CtrlAdRes.cs

@@ -50,7 +50,7 @@ namespace DW5S.App.UserControl
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsSat = unitOfWork.Of<SatInfo>();
                 satList.AddRange(await repsSat.GetAllAsync(p => p.UpdateTime));
-                this.txtSat.UseDefault().SetData(GetAllSat, nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
+                this.txtSat.UseDefault(showClearBtn: true).SetData(GetAllSat, nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
             }
             catch (Exception ex)
             {
@@ -157,7 +157,9 @@ namespace DW5S.App.UserControl
                     var max = queryable.OrderByDescending(p => p.SigTime).FirstOrDefault();
                     if (max != null)
                     {
-                        end = max.SigTime;
+                        // end = max.SigTime;
+#warning Oracle数据库时注意
+                        end = max.SigTime.AddMinutes(1);//sqlite查询不到对应等于时间的数据，所以加了一分钟
                         start = end.AddHours(-Convert.ToInt32(txtTimeCho.EditValue));
                     }
                 }

DW5S.App/UserControl/CtrlCgRes.cs

@@ -41,7 +41,7 @@ namespace DW5S.App.UserControl
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsTask = unitOfWork.Of<TaskInfo>();
                 var tskLists = await repsTask.GetAllAsync(p => p.UpdateTime);
-                this.txtTask.UseDefault().SetData(tskLists.To<List<TaskViewModel>>(), nameof(TaskViewModel.TaskName)).UseDoubleClickToSelectAll();
+                this.txtTask.UseDefault(showClearBtn: true).SetData(tskLists.To<List<TaskViewModel>>(), nameof(TaskViewModel.TaskName)).UseDoubleClickToSelectAll();
 
             }
             catch (Exception ex)

DW5S.App/UserControl/CtrlHome.cs

@@ -603,13 +603,30 @@ namespace DW5S.App.UserControl
                     if (tsk == null) return;
                     if (!DxHelper.MsgBoxHelper.ShowConfirm($"删除任务[{tsk.TaskName}]?"))
                         return;
+
+
                     var unitOfWork = IocContainer.UnitOfWork;
+                    //var repsPosRes = unitOfWork.OfLong<PosRes>();
+                    //await repsPosRes.DeleteAsync(p => p.TaskID == tsk.Id);
+
+                    //var repsCgRes = unitOfWork.OfLong<CgRes>();
+                    //await repsCgRes.DeleteAsync(p => p.TaskID == tsk.Id);
+
+                    //var repsCheckRes = unitOfWork.OfLong<CheckRes>();
+                    //await repsCheckRes.DeleteAsync(p => p.TaskID == tsk.Id);
+
+
+                    //var repsStationRes = unitOfWork.OfLong<StationRes>();
+                    //await repsStationRes.DeleteAsync(p => p.TaskID == tsk.Id);
+
                     var repsTaskSig = unitOfWork.Of<TaskSig>();
                     await repsTaskSig.DeleteAsync(p => p.TaskInfoID == tsk.Id);
 
                     var repsTask = unitOfWork.Of<TaskInfo>();
                     await repsTask.DeleteAsync(p => p.Id == tsk.Id);
                     await unitOfWork.SaveAsync();
+
+
                     gridView1.DeleteSelectedRows();
 
                 }

DW5S.App/UserControl/CtrlRefCgRes.cs

@@ -40,7 +40,7 @@ namespace DW5S.App.UserControl
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsSat = unitOfWork.Of<SatInfo>();
                 satList.AddRange(await repsSat.GetAllAsync(p => p.UpdateTime));
-                this.txtSat.UseDefault().SetData(satList.To<List<SatViewModel>>(), displayField: nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
+                this.txtSat.UseDefault(showClearBtn: true).SetData(satList.To<List<SatViewModel>>(), displayField: nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
                
             }
             catch (Exception ex)