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

fix(esppTemplateSync): Имя шаблона переводится в верхний регистр для правильного сравнения с объектом из ЕСПП

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-11-28 15:32:06 +10:00
parent 09de164dcd
commit 7e708e4aee
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PARR.EsppOrderLoaderWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.EsppOrderManagerWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

4
PARR.EsppScheduleSync/ScheduleSyncher.cs
View File

@@ -95,7 +95,7 @@ namespace PARR.EsppScheduleSync
var esppObjectFromDb = new EsppObjectSchedule var esppObjectFromDb = new EsppObjectSchedule
{ {
TemplateName = template.Name, TemplateName = template.Name.ToUpper(),
Code = template.ScheduleEsppId ?? "", Code = template.ScheduleEsppId ?? "",
ScheduleName = template.Name, ScheduleName = template.Name,
IsActive = template.IsActiveSchedule, IsActive = template.IsActiveSchedule,
@@ -204,7 +204,7 @@ namespace PARR.EsppScheduleSync
return null; return null;
} }
var templateName = splittedContent[6]; var templateName = splittedContent[6].ToUpper();
var scheduleName = splittedContent[2]; var scheduleName = splittedContent[2];
if (!IsValidName(templateName) || !IsValidName(scheduleName)) if (!IsValidName(templateName) || !IsValidName(scheduleName))

10
PARR.EsppScheduleSyncWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

4
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -84,7 +84,7 @@ namespace PARR.EsppTemplateSync
{ {
var templateFromDb = new EsppObjectTemplate var templateFromDb = new EsppObjectTemplate
{ {
TemplateName = template.Name, TemplateName = template.Name.ToUpper(),
IsActive = template.IsActiveTemplate, IsActive = template.IsActiveTemplate,
//WorkGroup = template.Host!.WorkGroup!, //WorkGroup = template.Host!.WorkGroup!,
WorkGroup = template.Unit!.BaseFields!.WorkGroup!, WorkGroup = template.Unit!.BaseFields!.WorkGroup!,
@@ -155,7 +155,7 @@ namespace PARR.EsppTemplateSync
var templateFromEspp = new EsppObjectTemplate var templateFromEspp = new EsppObjectTemplate
{ {
TemplateName = templateName, TemplateName = templateName.ToUpper(),
IsActive = isActive, IsActive = isActive,
WorkGroup = workGroup, WorkGroup = workGroup,
ShortDescription = shortDescription, ShortDescription = shortDescription,

10
PARR.EsppTemplateSyncWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.GeneratorTemplatesWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.JobAutoControlWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.MasterWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.MockData/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.NextRunWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.TemplateActivatorWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.TemplateDistributorWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

2
PARR.TemplateGeneratorWorker/TemplateGenerator.cs
View File

@@ -95,7 +95,7 @@ namespace PARR.TemplateGeneratorWorker
var template = new Template var template = new Template
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Name = templateName, Name = templateName.ToUpper(),
UnitId = query.UnitId, UnitId = query.UnitId,
JobId = query.JobId, JobId = query.JobId,
IsActiveTemplate = query.IsActiveTemplate ?? false, IsActiveTemplate = query.IsActiveTemplate ?? false,

10
PARR.TemplateGeneratorWorker/appsettings.json
View File

@@ -11,11 +11,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {

10
PARR.Test/appsettings.json
View File

@@ -10,11 +10,11 @@
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {
"Default": "Debug", "Default": "Information",
"Override": { "Override": {
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"WriteTo": [ "WriteTo": [
{ {