diff --git a/YLErpDAL/Helpers/OtcAppConfigHelper.cs b/YLErpDAL/Helpers/OtcAppConfigHelper.cs
deleted file mode 100644
index 4ba8388e..00000000
--- a/YLErpDAL/Helpers/OtcAppConfigHelper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YLErp.Helpers
-{
- public static class OtcAppConfigHelper
- {
- ///
- /// 对冲交易数据源(衡泰对冲:1,TRS对冲:2);两者都有:3
- ///
- public static int HedgingSource { get; set; }
- ///
- /// 接收衡泰回执
- ///
- public static int HTUpdate { get; set; }
- }
-}
diff --git a/YLErpDAL/Modules/DataCompare/Dto/HengTaiCompareData.cs b/YLErpDAL/Modules/DataCompare/Dto/HengTaiCompareData.cs
deleted file mode 100644
index 1f252428..00000000
--- a/YLErpDAL/Modules/DataCompare/Dto/HengTaiCompareData.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YLErp.Modules.DataCompare.Dto
-{
- public class HengTaiCompareData
- {
- public int id { get; set; } = 0;
-
- ///
- /// 对账日期
- ///
- public DateTime ValueDate { get; set; }
-
- ///
- /// 簿记账户
- ///
- public string AssetName { get; set; }
-
- ///
- /// 簿记Id
- ///
- public int AssetId { get; set; }
-
- ///
- /// 交易状态
- ///
- public string TradeStatus { get; set; }
-
- ///
- /// 交易编号
- ///
- public string TradeNumber { get; set; }
-
- ///
- /// 交易日期
- ///
- public DateTime? TradeDate { get; set; }
-
- ///
- /// 开始日期
- ///
- public DateTime? StartDate { get; set; }
-
- ///
- /// 到期日期
- ///
- public DateTime? EndDate { get; set; }
-
- ///
- /// 结构类型
- ///
- public string StructType { get; set; }
-
-
- ///
- /// 计价货币
- ///
- public string QuoteCurrency { get; set; }
-
-
- ///
- /// 交易对手方
- ///
- public string ClientName { get; set; }
-
- ///
- /// 交易员
- ///
- public string TraderName { get; set; }
-
- ///
- /// 互换类型
- ///
- public string SwapType { get; set; }
-
- ///
- /// 名义本金
- ///
- public decimal StockEqvNotional { get; set; }
-
- ///
- /// 衡泰名义本金
- ///
- public decimal? StockEqvNotionalV2 { get; set; }
-
- ///
- /// 持仓市值
- ///
- public decimal Pv { get; set; }
-
- ///
- /// 持仓市值衡泰
- ///
- public decimal? PvV2 { get; set; }
-
- ///
- /// 虚拟交易费用
- ///
- public decimal VTradingFee { get; set; }
-
- ///
- /// 是否一致
- ///
- public bool CheckResult { get; set; }
-
- public string CheckResultStr
- {
- get
- {
- if (CheckResult)
- {
- return "一致";
- }
- return "异常";
- }
- }
- }
-}
diff --git a/YLErpDAL/Modules/DataCompare/Dto/LiquidationTimeDto.cs b/YLErpDAL/Modules/DataCompare/Dto/LiquidationTimeDto.cs
deleted file mode 100644
index 983185bb..00000000
--- a/YLErpDAL/Modules/DataCompare/Dto/LiquidationTimeDto.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YLErp.Modules.DataCompare.Dto
-{
- public class LiquidationTimeDto
- {
- ///
- /// 系统清算时间
- ///
- public string SystemLiquidationTime { get; set; }
-
- ///
- /// 衡泰清算时间
- ///
- public string HengTaiLiquidationTime { get; set; }
- }
-}
diff --git a/YLErpDAL/Modules/DataCompare/Dto/OnlyHengTaiDataDto.cs b/YLErpDAL/Modules/DataCompare/Dto/OnlyHengTaiDataDto.cs
deleted file mode 100644
index 5204443f..00000000
--- a/YLErpDAL/Modules/DataCompare/Dto/OnlyHengTaiDataDto.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YLErp.Modules.DataCompare.Dto
-{
- public class OnlyHengTaiDataDto
- {
- public long id { get; set; } = 0;
-
- ///
- /// 对账日期
- ///
- public DateTime ValueDate { get; set; }
-
- ///
- /// 交易编号
- ///
- public string TradeNumber { get; set; }
-
- ///
- /// 开始日期
- ///
- public DateTime? StartDate
- {
- get
- {
- if (!string.IsNullOrEmpty(StartDateStr))
- {
- DateTime result;
- if (DateTime.TryParse(StartDateStr, out result))
- {
- return result;
- }
- }
- return null;
- }
- }
-
- public string StartDateStr { get; set; }
-
- ///
- /// 到期日期
- ///
- public DateTime? EndDate
- {
- get
- {
- if (!string.IsNullOrEmpty(EndDateStr))
- {
- DateTime result;
- if (DateTime.TryParse(EndDateStr, out result))
- {
- return result;
- }
- }
- return null;
- }
- }
-
- public string EndDateStr { get; set; }
-
- ///
- /// 衡泰名义本金
- ///
- public decimal? StockEqvNotionalV2 { get; set; }
-
- ///
- /// 持仓市值衡泰
- ///
- public decimal? PvV2 { get; set; }
- }
-}
diff --git a/YLErpDAL/Modules/DataCompare/Dto/QueryNeedCompareDataRequest.cs b/YLErpDAL/Modules/DataCompare/Dto/QueryNeedCompareDataRequest.cs
deleted file mode 100644
index ec0a9dc5..00000000
--- a/YLErpDAL/Modules/DataCompare/Dto/QueryNeedCompareDataRequest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using BaseOUDAL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace YLErp.Modules.DataCompare.Dto
-{
- public class QueryNeedCompareDataRequest: BaseSearchReq
- {
- public DateTime ValueDate { get; set; }
-
- public List AssetId { get; set; }
-
- public string TradeNumber { get; set; }
-
- public bool ShowException { get; set; }
-
-
- }
-}
diff --git a/YLErpWeb/App/AppHelper.cs b/YLErpWeb/App/AppHelper.cs
index 3334f624..1da8e5ac 100644
--- a/YLErpWeb/App/AppHelper.cs
+++ b/YLErpWeb/App/AppHelper.cs
@@ -83,8 +83,6 @@ namespace YLErp.Web
}
OtcConfig.SetReadOnly();
- OtcAppConfigHelper.HedgingSource= OtcConfig.HedgingSource;
- OtcAppConfigHelper.HTUpdate= OtcConfig.HTUpdate;
}
///
diff --git a/YLErpWeb/App/Config/OtcAppConfig.cs b/YLErpWeb/App/Config/OtcAppConfig.cs
index a175d585..2523fea9 100644
--- a/YLErpWeb/App/Config/OtcAppConfig.cs
+++ b/YLErpWeb/App/Config/OtcAppConfig.cs
@@ -12,8 +12,6 @@
private string tradeRiskCalcV2;
private string futureVersion;
private int hedgingOrder;
- private int hedgingSource;
- private int htUpdate;
public void SetReadOnly()
{
@@ -67,30 +65,6 @@
hedgingOrder = value;
}
}
- ///
- /// 对冲交易数据源(衡泰对冲:1,TRS对冲:2);两者都有:3
- ///
- [ConfigField(Description = "对冲交易数据源", DataMapString = "&衡泰对冲=1&TRS对冲=2", IsFlags = true)]
- public int HedgingSource
- {
- get => hedgingSource; set
- {
- CheckReadOnly();
- hedgingSource = value;
- }
- }
- ///
- /// 接衡泰修改回执
- ///
- [ConfigField(Description = "接衡泰修改回执", DataMapString = "&接衡泰修改回执=1", IsFlags = true)]
- public int HTUpdate
- {
- get => htUpdate; set
- {
- CheckReadOnly();
- htUpdate = value;
- }
- }
[ConfigField(Description = "报价周期选项设置(交易参数设置)")]
public bool QuotationCycleOption
{