feat(esppOrderManager): доработка логики. EsppApi - запросы переделаны под модели.

This commit is contained in:
Mikhail Trubnikov
2023-11-21 12:26:08 +10:00
parent 7f3a2441c9
commit f85b97f60a
13 changed files with 261 additions and 29 deletions

View File

@@ -3,6 +3,7 @@ using PARR.Constants;
using PARR.DAL.Models;
using PARR.EsppApi;
using PARR.EsppApi.Models.Query;
using PARR.EsppOrderManager.Settings;
namespace PARR.EsppOrderManager.Services
{
@@ -10,14 +11,17 @@ namespace PARR.EsppOrderManager.Services
{
private readonly ILogger<EsppOrderService> logger;
private readonly IEsppApiService esppApiService;
private readonly EsppPoligonSettings esppPoligonSettings;
public EsppOrderService(
ILogger<EsppOrderService> logger,
IEsppApiService esppApiService
IEsppApiService esppApiService,
EsppPoligonSettings esppPoligonSettings
)
{
this.logger = logger;
this.esppApiService = esppApiService;
this.esppPoligonSettings = esppPoligonSettings;
}
@@ -68,9 +72,15 @@ namespace PARR.EsppOrderManager.Services
{
JobOperation = order!.Template!.ApplicationsInWork!.Work!.Name,
RecordId = order.Number,
Time = duration.ToString("HH:mm")
Time = duration.ToString("hh\\:mm")
};
if (esppPoligonSettings.IsEnabled)
{
//для теста, подемеяем значения из БД
tnk.JobOperation = esppPoligonSettings.TnkValue;
}
return await SetCompleteStatusAsync(order.Number, resultMsg, tnk);
}
else
@@ -104,6 +114,8 @@ namespace PARR.EsppOrderManager.Services
return false;
}
else
logger.LogDebug($"В ЕСПП, для наряда {orderNumber} списаны трудозатраты. Операция: {tnk.JobOperation}, время: {tnk.Time}");
// выполняем наряд
var result = await esppApiService.SetStatusIsDoneAsync(orderNumber, resultMsg);