feat(api,dal): исключения расписаний ЕСПП привязаны к JobGroup, удалены константы из настроек. Кол-во шаблонов в Job считается только used. В JobFieldFilter добавлено поле IsInverse.
This commit is contained in:
@@ -531,6 +531,20 @@
|
||||
public const string GetAll = Base + "/kii-units/";
|
||||
}
|
||||
|
||||
#region Расписание - исключения
|
||||
|
||||
public static class ScheduleExcludeType
|
||||
{
|
||||
public const string GetAll = Base + "/schedule-exclude-types/";
|
||||
}
|
||||
|
||||
public static class ScheduleExcludeTypeCalendar
|
||||
{
|
||||
public const string GetAll = Base + "/schedule-exclude-type-calendars/";
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -23,6 +23,10 @@
|
||||
|
||||
public DateTimeOffset ReferenceDate { get; set; }
|
||||
|
||||
public Guid ScheduleExcludeTypeId { get; set; }
|
||||
|
||||
public Guid? ScheduleExcludeTypeCalendarId { get; set; }
|
||||
|
||||
//public bool IsAutoDistributionEnabled { get; set; }
|
||||
|
||||
//public bool IsAgent { get; set; }
|
||||
|
||||
@@ -57,6 +57,8 @@
|
||||
|
||||
public string? ValueMask { get; set; }
|
||||
|
||||
public bool IsInverse { get; set; } = false;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -42,6 +42,16 @@
|
||||
public int JobsCount { get; set; }
|
||||
public JobGroupScheduleResponse? Schedule { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Расписание
|
||||
/// </summary>
|
||||
public ScheduleExcludeTypeResponse? ScheduleExcludeType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Тип исключения - календарь
|
||||
/// </summary>
|
||||
public ScheduleExcludeTypeCalendarResponse? ScheduleExcludeTypeCalendar { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public class JobGroupScheduleResponse
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
public class JobResponse : JobBaseResponse
|
||||
{
|
||||
|
||||
public TnkResponse? Tnk { get; set; }
|
||||
|
||||
public JobGroupBaseResponse? Group { get; set; }
|
||||
@@ -33,7 +32,7 @@
|
||||
|
||||
public JobAutoControlResponse? AutoControl { get; set; }
|
||||
|
||||
#region Статистика
|
||||
#region Статистика Old
|
||||
|
||||
//public TemplateStats? TemplateStatistics { get; set; }
|
||||
|
||||
@@ -64,6 +63,8 @@
|
||||
|
||||
public string? ValueMask { get; set; }
|
||||
|
||||
public bool IsInverse { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace PARR.API.Contracts.V1.Responses
|
||||
{
|
||||
public class ScheduleExcludeTypeCalendarResponse
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
public required string Title { get; set; }
|
||||
|
||||
public required string EsppName { get; set; }
|
||||
|
||||
public required string EsppValue { get; set; }
|
||||
|
||||
public required string Code { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace PARR.API.Contracts.V1.Responses
|
||||
{
|
||||
public class ScheduleExcludeTypeResponse
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
public required string Title { get; set; }
|
||||
|
||||
public required string EsppName { get; set; }
|
||||
|
||||
public required string EsppValue { get; set; }
|
||||
|
||||
public required string Code { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,16 @@
|
||||
/// </summary>
|
||||
public EsppScheduleResponse? Schedule { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Тип исклчения
|
||||
/// </summary>
|
||||
public ScheduleExcludeTypeResponse? ScheduleExcludeType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Тип исключения - календарь
|
||||
/// </summary>
|
||||
public ScheduleExcludeTypeCalendarResponse? ScheduleExcludeTypeCalendar { get; set; }
|
||||
|
||||
public int OrderCount { get; set; }
|
||||
|
||||
public TemplateStatusTypeResponse? StatusType { get; set; }
|
||||
|
||||
Reference in New Issue
Block a user