Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'glms/feature/1.4.2' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs into glms/feature/1.4.2

Browse Source
This commit is contained in:
锦麟 王
2026-06-25 14:33:08 +08:00
parent 6d17e95197 20ea93d89c
commit 206e070d52
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs
+8 -8
View File
@@ -932,10 +932,10 @@ namespace YLErp.Modules.RiskModule
};
setValue(swap, swapSetting);
swap.DV = swapDV;
swap.Quota_DV_Upper = tradeDvSetting?.QuotaUpperLimit ?? double.NaN;
swap.Quota_DV_Lower = tradeDvSetting?.QuotaLowerLimit ?? double.NaN;
swap.Quota_DV_wUpper = tradeDvSetting?.WarningUpperLimit ?? double.NaN;
swap.Quota_DV_wLower = tradeDvSetting?.WarningLowerLimit ?? double.NaN;
//swap.Quota_DV_Upper = tradeDvSetting?.QuotaUpperLimit ?? double.NaN;
//swap.Quota_DV_Lower = tradeDvSetting?.QuotaLowerLimit ?? double.NaN;
//swap.Quota_DV_wUpper = tradeDvSetting?.WarningUpperLimit ?? double.NaN;
//swap.Quota_DV_wLower = tradeDvSetting?.WarningLowerLimit ?? double.NaN;
var positionList = new List<KeyValuePair<trade, realtime_trade_risk>>();
var underly = GetTradePositionPnl();
@@ -1047,10 +1047,10 @@ namespace YLErp.Modules.RiskModule
};
setValue(swap, swapSetting);
swap.DV = eodSwapDV;
swap.Quota_DV_Upper = tradeDvSetting?.QuotaUpperLimit ?? double.NaN;
swap.Quota_DV_Lower = tradeDvSetting?.QuotaLowerLimit ?? double.NaN;
swap.Quota_DV_wUpper = tradeDvSetting?.WarningUpperLimit ?? double.NaN;
swap.Quota_DV_wLower = tradeDvSetting?.WarningLowerLimit ?? double.NaN;
//swap.Quota_DV_Upper = tradeDvSetting?.QuotaUpperLimit ?? double.NaN;
//swap.Quota_DV_Lower = tradeDvSetting?.QuotaLowerLimit ?? double.NaN;
//swap.Quota_DV_wUpper = tradeDvSetting?.WarningUpperLimit ?? double.NaN;
//swap.Quota_DV_wLower = tradeDvSetting?.WarningLowerLimit ?? double.NaN;
var underly = GetEodTradePositionPnl(req.ValueDate);
var unTrade = new QuotaMonitor_Global()
{
YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml
+1 -1
View File
@@ -154,7 +154,7 @@
<td>{{priceFormat(floatPosition.PosiGrossPrice)}}</td>
<td v-if="deal.StructureType!='普通收益互换'">{{priceFormat(floatPosition.TradingAmountNetAvg)}}</td>
<td>
{{priceFormat(floatPosition.TradingAmountAvg)}}
{{floatPosition.TradingAmountAvg}}
</td>
<td>{{floatPosition.Quantity}}</td>
<td>
YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
+2 -1
View File
@@ -43,7 +43,8 @@ const vue = new Vue({
this.floatPosition = positions[0];
this.initPosiNetPrice = this.floatPosition.PosiNetPrice;
// 互换标的价格固定为期初净价，与平仓不同不需要用户填写
this.floatPosition.TradingAmountAvg = this.initPosiNetPrice;
// 期初净价入库为相对价(如1.02)，需转换为界面百分比形态(102)，与平仓页保持一致
this.floatPosition.TradingAmountAvg = this.initPosiNetPrice * this.multiplier;
this.interestList = model.FlowEvents.filter((item) => {
return item.InterestMode == 1 || item.InterestMode == 2 || item.InterestMode == 7 || item.InterestMode == 8 || item.InterestMode == 9;
});