添加排序

DW5S.App/UserControl/CtrlRefTask.cs

@@ -52,10 +52,12 @@ namespace DW5S.App.UserControl
                             gridView1.RefreshData();
                             gridView1.BestFitColumns();
 
+                            DxHelper.MsgBoxHelper.ShowInfo("一键启用成功!");
                         }
                         catch (Exception ex)
                         {
                             IocContainer.Logger.Error(ex, "一键启用异常");
+                            DxHelper.MsgBoxHelper.ShowError("一键启用异常");
                         }
                     }, false)
                     .AddContentMenu<RefTaskViewModel>("一键禁用", SvgHelper.CreateCycle("#FF0000"), async data =>
@@ -72,11 +74,12 @@ namespace DW5S.App.UserControl
                              data.ForEach(d => d.Enable = false);
                              gridView1.RefreshData();
                              gridView1.BestFitColumns();
-
+                             DxHelper.MsgBoxHelper.ShowInfo("一键禁用成功!");
                          }
                          catch (Exception ex)
                          {
                              IocContainer.Logger.Error(ex, "一键禁用异常");
+                             DxHelper.MsgBoxHelper.ShowError("一键禁用异常");
                          }
                      }, false);
                 List<TxInfo> refTxList = new List<TxInfo>();
@@ -85,7 +88,7 @@ namespace DW5S.App.UserControl
                      .Include(r => r.SampleInfo)
                         .Include(r => r.SampleInfo.SigInfo)
                         .Include(r => r.SampleInfo.RefTxInfo)
-                        .Include(r => r.SatInfo).OrderBy(p => p.Enable).ToListAsync();
+                        .Include(r => r.SatInfo).OrderBy(p => p.Enable).ThenBy(p=>p.SampleInfo.SigInfo.FreqDown).ToListAsync();
                 list.AddRange(items.To<List<RefTaskViewModel>>());
 
                 refTxList = await unitOfWork.Of<TxInfo>().AsQueryable()

DW5S.App/UserControl/CtrlSample.cs

@@ -34,7 +34,7 @@ namespace DW5S.App.UserControl
                 var items = await unitOfWork.Of<SampleInfo>().AsQueryable()
                       .Include(s => s.SigInfo)
                         .Include(s => s.RefTxInfo)
-                        .OrderBy(p => p.SampleName)
+                        .OrderBy(p => p.SampleName).ThenBy(p=>p.SigInfo.FreqDown)
                         .ToListAsync();
 
                 listSampleInfo.AddRange(items.To<List<SampleViewModel>>());

DW5S.App/UserControl/CtrlSignal.cs

@@ -45,7 +45,7 @@ namespace DW5S.App.UserControl
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsSig = unitOfWork.Of<SigInfo>();
                 var items = await repsSig.GetAllAsync(p => p.FreqUp);
-                listSigInfo.AddRange(items.To<List<SigViewModel>>());
+                listSigInfo.AddRange(items.To<List<SigViewModel>>().OrderBy(i=>i.FreqDown));
                 var repsFixedStation = unitOfWork.Of<FixedStation>();
                 var fixedStations = await repsFixedStation.FindAsync(p => p.Enable);
                 foreach (var item in listSigInfo)

DW5S.App/UserControl/CtrlXl.cs

@@ -16,12 +16,14 @@ using DW5S.Repostory;
 using Serilog;
 using static DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper;
 using DW5S.Service;
+using DW5S.ViewModel;
+using XdCxRhDW5S.ViewModel;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlXl : DevExpress.XtraEditors.XtraUserControl
     {
-        List<XlInfo> list = new List<XlInfo>();
+        List<XlViewModel> list = new List<XlViewModel>();
         int maxCount = 0;
         int maxPage = 0;
         int currentPage = 1;
@@ -36,7 +38,7 @@ namespace DW5S.App.UserControl
 
         private async void TxtSat_EditValueChanged(object sender, EventArgs e)
         {
-            var sat = txtSat.EditValue as SatInfo;
+            var sat = txtSat.EditValue as SatViewModel;
             satCode = sat?.SatCode;
             var unitOfWork = IocContainer.UnitOfWork;
             var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
@@ -56,10 +58,10 @@ namespace DW5S.App.UserControl
             var unitOfWork = IocContainer.UnitOfWork;
             var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var sat = await repsXl.GetAllSat();
-            txtSat.UseDefault("不限制", true).SetData(sat, nameof(SatInfo.Sat));
+            txtSat.UseDefault("不限制", true).SetData(sat.To<List<SatViewModel>>(), displayField: nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
 
-            gridXl.UseDefault(list).UseRowNumber().UseDeleteAsync<XlInfo>(Del)
-                .UseClearAsync<XlInfo>(Clear).UseExportXlsx()
+            gridXl.UseDefault(list).UseRowNumber().UseDeleteAsync<XlViewModel>(Del)
+                .UseClearAsync<XlViewModel>(Clear).UseExportXlsx()
             .AddMenu("星历推算", SvgHelper.LoadFromFile("Image\\XlCalc.svg"), () =>
             {
                 var ids = gridView1.GetSelectedRows();
@@ -68,7 +70,7 @@ namespace DW5S.App.UserControl
                     XtraMessageBox.Show("请选择需要星历推算的数据信息!");
                     return;
                 }
-                var item = gridView1.GetRow(ids[0]) as XlInfo;
+                var item = gridView1.GetRow(ids[0]) as XlViewModel;
                 XlCalculateForm form = new XlCalculateForm(item.TwoLine);
                 form.ShowDialog();
             })
@@ -114,7 +116,7 @@ namespace DW5S.App.UserControl
             var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
             var dtResult = await repsXl.GetPageAsync(currentPage, Convert.ToInt32(txtCountPerPage.Text), satCode);
             list.Clear();
-            list.AddRange(dtResult);
+            list.AddRange(dtResult.To<List<XlViewModel>>());
             gridView1.RefreshData();
             if (maxPage == 1)
             {
@@ -172,7 +174,7 @@ namespace DW5S.App.UserControl
 
         }
 
-        private async Task<bool> Del(List<XlInfo> list)
+        private async Task<bool> Del(List<XlViewModel> list)
         {
 
             try
@@ -180,7 +182,7 @@ namespace DW5S.App.UserControl
                 this.Enabled = false;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsXl = unitOfWork.Of<XlInfo>();
-                await repsXl.DeleteAsync(list);
+                await repsXl.DeleteAsync(list.To<List<XlInfo>>());
                 await unitOfWork.SaveAsync();
                 await LoadData(1);
                 return true;
@@ -197,14 +199,14 @@ namespace DW5S.App.UserControl
                 this.Enabled = true;
             }
         }
-        private async Task<bool> Clear(List<XlInfo> list)
+        private async Task<bool> Clear(List<XlViewModel> list)
         {
             try
             {
                 this.Enabled = false;
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsXl = unitOfWork.Of<XlInfo>();
-                await repsXl.DeleteAsync(list);
+                await repsXl.DeleteAsync(list.To<List<XlInfo>>());
                 await unitOfWork.SaveAsync();
                 await LoadData(1);
                 return true;

DW5S.ViewModel/SigViewModel.cs

@@ -32,8 +32,7 @@ namespace DW5S.ViewModel
         [Display(Name = "带宽(Hz)")]
         public double Band { get; set; }
 
-        [NotMapped]
-        [Display(Name = "是否是固定站")]
+        [Display(Name = "是否是固定站", AutoGenerateField = false)]
         public string IsFixedStationFreq { get; set; }
 
         public override string ToString()