From 477b11708f96223645bef949f3f506aa81f147b5 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 25 Oct 2023 10:59:05 +1000 Subject: [PATCH] =?UTF-8?q?fix(esppTemplateSync):=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B9,=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D1=81=D0=B8=D0=BC=D0=B2?= =?UTF-8?q?=D0=BE=D0=BB=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=8B=20=D1=81=D1=82=D1=80=D0=BE=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.DAL/Models/Order.cs | 5 +++++ PARR.EsppTemplateSync/Services/Manager.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PARR.DAL/Models/Order.cs b/PARR.DAL/Models/Order.cs index 8827057e..8a9fb6ca 100644 --- a/PARR.DAL/Models/Order.cs +++ b/PARR.DAL/Models/Order.cs @@ -35,6 +35,11 @@ namespace PARR.DAL.Models /// public int? NextStatusCode { get; set; } + ///// + ///// Дата генерации наряда в ЕСПП + ///// + //public DateTimeOffset GenerateDate { get; set; } + [ForeignKey(nameof(TemplateId))] public Template? Template { get; set; } diff --git a/PARR.EsppTemplateSync/Services/Manager.cs b/PARR.EsppTemplateSync/Services/Manager.cs index 3e01e400..594bb89f 100644 --- a/PARR.EsppTemplateSync/Services/Manager.cs +++ b/PARR.EsppTemplateSync/Services/Manager.cs @@ -159,7 +159,8 @@ namespace PARR.EsppTemplateSync.Services if (parrValue == null || esppValue == null) continue; - if (parrValue!.ToString()!.ToLower() != esppValue!.ToString()!.ToLower()) + //Replace("\r","").Replace("\n","") - в подробном описании могут быть переносы строк, в Rabbit прилетает без переносов. Убираем переносы для стравнения + if (parrValue!.ToString()!.ToLower().Replace("\r", "").Replace("\n", "") != esppValue!.ToString()!.ToLower()) return true; }