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

生成确认书时, 联系人如果有多个, 同时展示

Browse Source
This commit is contained in:
嬴政 时
2026-05-15 10:56:27 +08:00
parent 29ecf6afa7
commit e5b5b723b3
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
+16 -10
View File
@@ -970,6 +970,12 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
return result;
}
public List<contactype> GetContractTypes()
{
var result = DbContextFactory.GetClientDbContext(OptUser).contactype.ToList();
return result;
}
/// <summary>
/// 获取工作日天数
/// </summary>
@@ -1310,7 +1316,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
join t in DbContext.trade on r.TradeId equals t.id
where r.Type == ContractTypeEnum.Trade && r.ContractCode.StartsWith(prefix)
select r;
var codeList = query.Select(s=>s.ContractCode).ToList();
var codeList = query.Select(s => s.ContractCode).ToList();
var count = codeList.Count;
do
{
@@ -1336,7 +1342,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
var posi = GetSwapPositions(Trade.id, true).FirstOrDefault(p => p.PositionType > 0);
var isLong = posi?.PositionType == (int)PositionTypeFlag.Short ? false : true;
return "GLMS-" + _client.Number + "-" + Trade.TradeDate?.ToString("yyyyMMdd") + (isLong ? "-L" : "-S");
return "GLMS-" + _client.Number + "-" + Trade.TradeDate?.ToString("yyyyMMdd") + (isLong ? "-L" : "-S");
}
return Trade.TradeNumber;
}
@@ -2788,12 +2794,12 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
return DbContext.swap_event.Where(x => x.SwapTradeId == tradeId && x.Invalid == true).ToList();
}
public List<swap_position> GetSwapPositions(int tradeId,bool? IsInitial)
public List<swap_position> GetSwapPositions(int tradeId, bool? IsInitial)
{
var query = DbContext.swap_position.Where(x => x.SwapTradeId == tradeId&&!x.Invalid);
var query = DbContext.swap_position.Where(x => x.SwapTradeId == tradeId && !x.Invalid);
if (IsInitial.HasValue)
{
query = query.Where(x=>x.IsInitial== IsInitial);
query = query.Where(x => x.IsInitial == IsInitial);
}
return query.ToList();
}
@@ -2842,9 +2848,9 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
return query.Distinct().Count();
}
public List<swap_flow> GetSwapFlows(int tradeId)
public List<swap_flow> GetSwapFlows(int tradeId)
{
return DbContext.swap_flow.Where(x=>x.SwapTradeId==tradeId&&x.DataState==(int)SwapFlowDateStateEnum.完成).AsNoTracking().ToList();
return DbContext.swap_flow.Where(x => x.SwapTradeId == tradeId && x.DataState == (int)SwapFlowDateStateEnum.完成).AsNoTracking().ToList();
}
public List<underlying_manager> GetUnderlyings(List<string> underlyingCodes)
@@ -2857,16 +2863,16 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
}
public List<swap_flow_event> GetFlowEvents(int tradeId, List<int> eventTypes)
{
return DbContext.swap_flow_event.Where(x => eventTypes.Contains(x.EventType)&&x.SwapTradeId==tradeId&&x.DataState==(int)SwapFlowDateStateEnum.完成).AsNoTracking().ToList();
return DbContext.swap_flow_event.Where(x => eventTypes.Contains(x.EventType) && x.SwapTradeId == tradeId && x.DataState == (int)SwapFlowDateStateEnum.完成).AsNoTracking().ToList();
}
public List<eod_swap_position> GetEodPositions(int tradeId, DateTime valueDate)
{
return DbContext.eod_swap_position.Where(x=> x.SwapTradeId==tradeId && !x.Invalid&&x.ValueDate==valueDate).AsNoTracking().ToList();
return DbContext.eod_swap_position.Where(x => x.SwapTradeId == tradeId && !x.Invalid && x.ValueDate == valueDate).AsNoTracking().ToList();
}
public List<SwapFlowDeal> GetSwapFlowDeals(int tradeId)
{
return DbContext.swap_flow_deal.Where(x => x.SwapTradeId == tradeId).AsNoTracking().ToList();
return DbContext.swap_flow_deal.Where(x => x.SwapTradeId == tradeId).AsNoTracking().ToList();
}
public swap_event GetEvent(long eventId)