mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dal,api): расширена таблица Job, добавлеа маска рабочей группы. Теперь можно генерировать шаблоны с единой экстерриториальной группой

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-08-22 11:25:51 +10:00
parent d30093dfef
commit a6385ea39a
12 changed files with 3957 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -175,6 +175,8 @@ namespace PARR.API.Controllers.V1
robotTaskTemplateResponse.TnkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.TnkName, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.WorkName))
robotTaskTemplateResponse.WorkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkName, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.WorkGroup))
robotTaskTemplateResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkGroup, task!.Template!.UnitId, task!.Template!.JobId);
return Ok(new Response<RobotTaskTemplateResponse>(robotTaskTemplateResponse, true));
case RobotsEnum.ScheduleOrder:
@@ -183,6 +185,8 @@ namespace PARR.API.Controllers.V1
//RobotTaskScheduleResponse
var robotTaskScheduleResponse = mapper.Map<RobotTaskScheduleResponse>(task);
if (shortcodesService.isAnyShortcodes(robotTaskScheduleResponse.WorkGroup))
robotTaskScheduleResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskScheduleResponse.WorkGroup, task!.Template!.UnitId, task!.Template!.JobId);
return Ok(new Response<RobotTaskScheduleResponse>(robotTaskScheduleResponse, true));
default: