Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2-margin

2026-08-24 09:40:03 +08:00
parent 7b1f69a410 733ade024a
commit 8648b62af9
338 changed files with 9170 additions and 64604 deletions
@@ -263,6 +263,10 @@ namespace YLErp.Modules.TradeModule.DealModule
                td.OptName = UserName;
                td.OptDate = OptDate;
                int passStatus = new ApprovalProcessService(OptUser).CheckTradeApprovalStep(td, OptUser.UserId);
+                if (passStatus != 0 && passStatus != -3)
+                {
+                    new TradeApprovalOAService(this).EnsureForCurrentNode(td);
+                }
                if (passStatus == 0)
                {
                    td.TradeStatus = ConsTrade.确认成交;