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

删除定义文件类型，删除所有判断山西固收的地方

Browse Source
This commit is contained in:
吴方海
2024-06-05 14:37:30 +08:00
parent 87d0d31e9a
commit 327a4158a5
60 changed files with 197 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DocGenerateModule/SwapSettlementBillGenerateService.cs
+4 -24
View File
@@ -68,7 +68,6 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
var resultList = new List<TradeDocGenerateResult>();
AppManager.TryResolve(out ITradeSettleBillGenerator generatorV2);
Dictionary<int, List<swap_flow_event>> noDMAFlows = new Dictionary<int, List<swap_flow_event>>();
Dictionary<int, List<swap_flow_event>> DMAFlows = new Dictionary<int, List<swap_flow_event>>();
List<trade_extend> extendList = null;
if (flowEvents != null && flowEvents.Any())
{
@@ -105,33 +104,19 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
}
if (trade.ValidState!=ConsGlobal.InValid)
{
if (trade.StructureType == "多空组合"||trade.StructureType== "定义文件型债券收益互换")
if (noDMAFlows.ContainsKey(trade.ClientId))
{
if (DMAFlows.ContainsKey(trade.ClientId))
{
DMAFlows[trade.ClientId].Add(flowEvent);
}
else
{
DMAFlows[trade.ClientId] = new List<swap_flow_event> { flowEvent };
}
noDMAFlows[trade.ClientId].Add(flowEvent);
}
else
{
if (noDMAFlows.ContainsKey(trade.ClientId))
{
noDMAFlows[trade.ClientId].Add(flowEvent);
}
else
{
noDMAFlows[trade.ClientId] = new List<swap_flow_event> { flowEvent };
}
noDMAFlows[trade.ClientId] = new List<swap_flow_event> { flowEvent };
}
}
}
if (noDMAFlows.Count()==0&& DMAFlows.Count()==0)
if (noDMAFlows.Count()==0)
{
throw new ServiceException("没有需要生成的确认书");
}
@@ -140,11 +125,6 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
var noDMAResults = GenerateShanxiSwap(item.Key, item.Value, trades, swapPositions, allFlowEvents, generatorV2, docType);
resultList.AddRange(noDMAResults);
}
foreach (var item in DMAFlows)
{
var DMAResults = GenerateShanxiSwap(item.Key, item.Value, trades, swapPositions, allFlowEvents, generatorV2, docType);
resultList.AddRange(DMAResults);
}
return resultList;
}