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

TRS-ZS-574 交易确认书对接OA自动提交审批

Browse Source
This commit is contained in:
shangzhongyuan
2025-07-25 13:40:56 +08:00
parent 75793f9f4f
commit d9fff3e9b8
32 changed files with 730 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs
+14 -1
View File
@@ -535,6 +535,9 @@ namespace YLErp.Modules.TradeModule.DealModule
from tcd in tcdsGroup.DefaultIfEmpty()
join sp in DbContext.swap_position.AsNoTracking().Where(s => s.IsInitial && s.PositionType > 0 && !s.Invalid)
on t.id equals sp.SwapTradeId
join oa in DbContext.tradeContractOaResult on t.id equals oa.trade_id into oaTemp
from oa in oaTemp.DefaultIfEmpty()
where oa == null || oa.is_valid == true
select new
{
t.id,
@@ -555,6 +558,9 @@ namespace YLErp.Modules.TradeModule.DealModule
tcr.OptDate,
tcr.OptName,
ContractDocId = tcd != null ? tcd.id : 0,
OAStatus = oa != null ? oa.status : "",
OAURL = oa != null ? oa.oa_url : "",
OAMessage = oa != null ? oa.oa_msg : ""
};
if (req.StartDate != null && req.StartDate != DateTime.MinValue)
@@ -611,7 +617,10 @@ namespace YLErp.Modules.TradeModule.DealModule
StampDocumentFileName = group.FirstOrDefault().StampDocumentFileName,
OptDate = group.FirstOrDefault().OptDate,
OptName = group.FirstOrDefault().OptName,
ContractDocId = group.FirstOrDefault().ContractDocId
ContractDocId = group.FirstOrDefault().ContractDocId,
OAStatus = group.FirstOrDefault().OAStatus,
OAURL = group.FirstOrDefault().OAURL,
OAMessage = group.FirstOrDefault().OAMessage
});
}
result = contractList.OrderByDescending(r => r.TradeDate).AsQueryable().ToSearchList(req);
@@ -694,5 +703,9 @@ namespace YLErp.Modules.TradeModule.DealModule
public int ContractDocId { get; set; }
public string OAStatus { get; set; }
public string OAURL { get; set; }
public string OAMessage { get; set; }
}
}