wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2026-05-12 15:33:44 +08:00
commit d81b522a37
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -1939,7 +1939,12 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var allSendUserNames = new List<string>(); var allSendUserNames = new List<string>();
var allSendTitles = new List<string>(); var allSendTitles = new List<string>();
var allSendDataIds = new List<Guid>(); var allSendDataIds = new List<Guid>();
SETrainNotifyStatus STATUS = SETrainNotifyStatus.草稿;
foreach (var notify in notifys) foreach (var notify in notifys)
{
STATUS = notify.STATUS;
try
{ {
notify.STATUS = SETrainNotifyStatus.归档; notify.STATUS = SETrainNotifyStatus.归档;
var record = new T_SE_TRAIN_RECORD var record = new T_SE_TRAIN_RECORD
@ -1986,6 +1991,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
allSendDataIds.Add(record.ID); allSendDataIds.Add(record.ID);
allSendUserIds.Add((Guid)notify.RECORD_USER_ID); allSendUserIds.Add((Guid)notify.RECORD_USER_ID);
allSendUserNames.Add(notify.Nav_RecordUser.NAME); allSendUserNames.Add(notify.Nav_RecordUser.NAME);
}
catch
{
notify.STATUS = STATUS;
}
notify.Nav_LaunchUser = null; notify.Nav_LaunchUser = null;
notify.Nav_RecordUser = null; notify.Nav_RecordUser = null;
}; };

2
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainPlanController.cs
View File

@ -131,7 +131,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
} }
} }
entity.STATUS = PFStandardStatus.Approving;
MFlowPermitService.InsertApprove(null, "SE071", ((int)entity.TYPE).ToString(), entity.ID, "SE071_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(null, "SE071", ((int)entity.TYPE).ToString(), entity.ID, "SE071_SHOWPRINT", entity.TaskID, true, () =>
{ {
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);