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-07-10 17:00:13 +08:00
parent fb59c6180a
commit c4293ed523
9 changed files with 207 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DealModule/TradeCloseService.cs
+2 -2
View File
@@ -126,8 +126,8 @@ namespace YLErp.Modules.TradeModule.DealModule
td.CheckStatus = Convert.ToInt32(TradeCheckEnum.StatusOfOld);
//检查是否有交易审批流程
if (valuedateBLL.SystemDate.CloseReApprove == 1 && hasTradeProcess)
//检查是否有交易审批流程（需求②：平仓/行权按交易状态查对应流程，而非只查开仓流程）
if (valuedateBLL.SystemDate.CloseReApprove == 1 && TradeProcessCountByCategory(td) > 0)
{
// 如果有审批组
InitTradeProcessOrder(td, UserId);
YLErpDAL/Modules/TradeModule/DealModule/TradeExerciseService.cs
+2 -1
View File
@@ -107,7 +107,8 @@ namespace YLErp.Modules.TradeModule.DealModule
td.OptDate = DateTime.Now;
td.TradeStatus = ConsTrade.行权待复核;
td.CheckStatus = Convert.ToInt32(TradeCheckEnum.StatusOfOld);
if (valuedateBLL.SystemDate.CloseReApprove == 1 && hasTradeProcess)
// 需求②：行权按交易状态查对应流程，而非只查开仓流程
if (valuedateBLL.SystemDate.CloseReApprove == 1 && TradeProcessCountByCategory(td) > 0)
{
//如果有审批组
InitTradeProcessOrder(td,UserId);
YLErpDAL/Modules/TradeModule/DealModule/TradeUnwindService.cs
+4 -4
View File
@@ -294,8 +294,8 @@ namespace YLErp.Modules.TradeModule.DealModule
}
var result = new TradeUnwindResultModel(td);
//存在审批流程时，走审批成功流程
if (valuedateBLL.SystemDate.CloseReApprove == 1 && HasTradeProcess())
//存在审批流程时，走审批成功流程（需求②：按交易状态查对应流程）
if (valuedateBLL.SystemDate.CloseReApprove == 1 && TradeProcessCountByCategory(td) > 0)
{
result.ApprovalProcess = true;
@@ -462,8 +462,8 @@ namespace YLErp.Modules.TradeModule.DealModule
throw new ServiceException("平仓费不一致！复核不通过");
}
}
//存在审批流程时，走审批成功流程
if (valuedateBLL.SystemDate.CloseReApprove == 1 && HasTradeProcess())
//存在审批流程时，走审批成功流程（需求②：按交易状态查对应流程）
if (valuedateBLL.SystemDate.CloseReApprove == 1 && TradeProcessCountByCategory(td) > 0)
{
var reqModel = new TradeOpenReqModel
{