频点查询条件加任务里的频点

Service/X2D1NoRefTaskServer/Service/TaskService.cs

@@ -799,6 +799,7 @@ namespace X2D1NoRefTaskServer.Service
                                     return;
                                 }
                             });
+                            #region 注释
                             //foreach (var xdInfos in xdgbInfos)
                             //{
                             //    if (cts.IsCancellationRequested) return;
@@ -977,6 +978,7 @@ namespace X2D1NoRefTaskServer.Service
                             //    }
 
                             //}
+                            #endregion
                             ResetTime(formatFlag, ref preTime);
                             preTime = capTime;
 

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -120,7 +120,7 @@ namespace XdCxRhDW.App.UserControl
                 return;
             }
             OnSysSetingsChanged(SysConfig.Config);
-           
+
             try
             {
                 List<TxInfo> txList = new List<TxInfo>();
@@ -223,7 +223,7 @@ namespace XdCxRhDW.App.UserControl
                         this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem((posRes.FreqUpHz / 1e6).ToString("f3"), posRes.FreqUpHz));
                     }));
                 }
-                
+
             }
         }
         private async void GridView1_FocusedRowObjectChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventArgs e)
@@ -257,10 +257,10 @@ namespace XdCxRhDW.App.UserControl
             // }
             this.txtFrequpMHz.Properties.Items.Clear();
             this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem("全部", null));
-            var sigs =new List<PosFreq>();
+            var sigs = new List<PosFreq>();
             var dto = new PosFreqByTaskInfoIdDto()
             {
-                TaskInfoID=tsk.ID
+                TaskInfoID = tsk.ID
             };
             var res = await HttpHelper.PostRequestAsync<List<PosFreq>>(SysConfig.GetUrl("Result/GetFreqByTaskIdObsolete"), dto);
             if (res.code == 200)
@@ -269,7 +269,18 @@ namespace XdCxRhDW.App.UserControl
             {
                 this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem((item.FreqUpHz / 1e6).ToString("f3"), item.FreqUpHz));
             }
-
+            using (RHDWContext db = new RHDWContext())
+            {
+                var sigsTask = await db.TaskSigs.Where(w => w.TaskInfoID == tsk.ID).ToListAsync();
+                var noRepeat = sigsTask.Select(s=>new PosFreq() { FreqUpHz=s.FreqUp}).Except(sigs);
+                if (noRepeat.Any())
+                {
+                    foreach (var item in noRepeat)
+                    {
+                        this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem((item.FreqUpHz / 1e6).ToString("f3"), item.FreqUpHz));
+                    }
+                }
+            }
             txtFrequpMHz.SelectedIndex = 0;
             var btnEdit = (layoutControlGroup1.CustomHeaderButtons[1] as GroupBoxButton);
             var btnDel = (layoutControlGroup1.CustomHeaderButtons[2] as GroupBoxButton);