11

DW5S.App/EditForms/SampleEditor.cs

@@ -35,16 +35,16 @@ namespace DW5S.App.EditForms
         }
         private async void SampleEditor_Load(object sender, EventArgs e)
         {
-            var reftxs = new List<RefTxInfo>();
+            var reftxs = new List<TxInfo>();
             var refsigs = new List<SigInfo>();
 
             var unitOfWork = IocContainer.UnitOfWork;
-            var res = await unitOfWork.Of<RefTxInfo>().GetAllAsync();
+            var res = await unitOfWork.Of<TxInfo>().FindAsync(t=>t.TxType== EnumTxType.Ref);
             reftxs.AddRange(res);
             var refsigList = await unitOfWork.Of<SigInfo>().FindAsync(s => s.SigType == EnumSigType.Ref);
             refsigs.AddRange(refsigList);
 
-            this.searchLookRef.UseDefault().SetData(reftxs, displayField: nameof(RefTxInfo.Name)).UseDoubleClickToSelectAll();
+            this.searchLookRef.UseDefault().SetData(reftxs, displayField: nameof(TxInfo.Name)).UseDoubleClickToSelectAll();
             this.txtRefSig.UseDefault().SetData(refsigs, displayField: nameof(SigInfo.FreqDownDis)).UseDoubleClickToSelectAll();
 
             if (this.Text == "编辑样本" && info != null)
@@ -162,7 +162,7 @@ namespace DW5S.App.EditForms
                     DxHelper.MsgBoxHelper.ShowError($"移动样本文件到样本存储目录{settings.SampleDirectory}失败");
                     return;
                 }
-                var refinfo = (searchLookRef.EditValue as RefTxInfo);
+                var refinfo = (searchLookRef.EditValue as TxInfo);
                 var siginfo = (txtRefSig.EditValue as SigInfo);
                 info.SampleName = sampleName;
                 info.Fs = fsHz;

DW5S.App/MainForm.cs

@@ -62,9 +62,9 @@ namespace DW5S
             ctrlTypes.Add("星历管理", typeof(CtrlXl));
             ctrlTypes.Add("卫星管理", typeof(CtrlSat));
             ctrlTypes.Add("接收站管理", typeof(CtrlRecTx));
-            // ctrlTypes.Add("参考站管理", typeof(CtrlRefTx));
-            //ctrlTypes.Add("超短站管理", typeof(CtrlCdbTx));
-            //ctrlTypes.Add("测向站管理", typeof(CtrlCxTx));
+            ctrlTypes.Add("参考站管理", typeof(CtrlRefTx));
+            ctrlTypes.Add("超短站管理", typeof(CtrlCdbTx));
+            ctrlTypes.Add("测向站管理", typeof(CtrlCxTx));
             ctrlTypes.Add("固定站管理", typeof(CtrlFixedStation));
             ctrlTypes.Add("信号管理", typeof(CtrlSignal));
             ctrlTypes.Add("样本管理", typeof(CtrlSample));

DW5S.App/UserControl/CtrlRefTask.cs

@@ -87,7 +87,7 @@ namespace DW5S.App.UserControl
                     .Where(t => t.TxType == EnumTxType.Ref)
                   .OrderByDescending(p => p.UpdateTime).ToListAsync();
 
-                this.txtRef.UseDefault(showClearBtn: true).SetData(refTxList, displayField: nameof(RefTxInfo.Name)).UseDoubleClickToSelectAll();
+                this.txtRef.UseDefault(showClearBtn: true).SetData(refTxList, displayField: nameof(TxInfo.Name)).UseDoubleClickToSelectAll();
             }
             catch (Exception ex)
             {

DW5S.Entity/ADRes.cs

@@ -64,7 +64,7 @@ namespace DW5S.Entity
 
         [Display(AutoGenerateField = false)]
         [JsonIgnore]
-        public virtual RecTxInfo RecTxInfo { get; set; }
+        public virtual TxInfo RecTxInfo { get; set; }
         /// <summary>
         /// 接收站名称
         /// </summary>

DW5S.Entity/RefCgRes.cs

@@ -63,7 +63,7 @@ namespace DW5S.Entity
 
         [Display(AutoGenerateField = false)]
         [JsonIgnore]
-        public virtual RefTxInfo RefTxInfo { get; set; }
+        public virtual TxInfo RefTxInfo { get; set; }
         /// <summary>
         /// 参考站名称
         /// </summary>

DW5S.Entity/SampleInfo.cs

@@ -24,7 +24,7 @@ namespace DW5S.Entity
 
         [Display(AutoGenerateField = false)]
         [JsonIgnore]
-        public virtual RefTxInfo RefTxInfo { get; set; }
+        public virtual TxInfo RefTxInfo { get; set; }
 
         [Display(Name = "参考站")]
         public string RefName => RefTxInfo.Name;