diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs index 38a43d8d..52df4a9d 100644 --- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs +++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/BatchConfirmationGenerateService.cs @@ -90,7 +90,11 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule AppManager.TryResolve(out ITradeConfirmationGenerator generatorV2); var tradeContractGroupTradeIds = tradeDic.Values.Select(x => x.trade.id).ToList(); - if (generatorV2 != null) + + // 如果包含互换交易,强制走V1默认逻辑(不走插件) + var hasSwapTrade = tradeDic.Values.Any(x => x.trade.TradeType == "收益互换"); + + if (generatorV2 != null && hasSwapTrade) { var result = GenerateSingleV2( generatorV2, @@ -109,7 +113,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule resultList.Add(GenerateSingleV1(item.Value, docType)); } } - if (generatorV2 == null) + if (generatorV2 == null || hasSwapTrade) { DbContext.SaveChanges(); }