修改成仅期权确认书页面
This commit is contained in:
@@ -177,6 +177,9 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
|
||||
{
|
||||
foreach (var tradeContractGroup in tradeDic.Values)
|
||||
{
|
||||
//判断是否为期权交易(非收益互换的交易强制走默认逻辑V1,不走插件)
|
||||
var isOptionTrade = tradeContractGroup.trade.TradeType != "收益互换";
|
||||
//插件版本(期权交易强制使用V1默认逻辑)
|
||||
if ((tradeContractGroup.trade.TradeType != "结构化交易" && tradeContractGroup.trade.TradeType != "收益互换" && tradeContractGroup.trade_cash == null)
|
||||
|| (tradeContractGroup.trade.TradeType == "结构化交易" && tradeContractGroup.trade.IsGroup == 0 && tradeContractGroup.trade.SubTrades.Any(O => O.trade_cash == null)))
|
||||
{
|
||||
@@ -185,8 +188,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
|
||||
ErrorMessage = "缺少现金交割记录"
|
||||
});
|
||||
}
|
||||
//插件版本
|
||||
else if (generatorV2 != null)
|
||||
else if (generatorV2 != null && !isOptionTrade)
|
||||
{
|
||||
var result = GenerateSingleV2(generatorV2, tradeContractGroup, docType);
|
||||
resultList.Add(result);
|
||||
|
||||
Reference in New Issue
Block a user