| | | 1 | | using Microsoft.AspNetCore.Authorization; |
| | | 2 | | using Microsoft.AspNetCore.Mvc; |
| | | 3 | | using Microsoft.EntityFrameworkCore; |
| | | 4 | | using OzonDomains.Models; |
| | | 5 | | using OzonDomains.Nomenclature; |
| | | 6 | | using OzonRepositories.Context; |
| | | 7 | | using Services.ApiServices._1CApi.Nomenclature; |
| | | 8 | | using Services.ApiServices._1CApi.OData; |
| | | 9 | | |
| | | 10 | | namespace OzonOrdersWeb.Areas.Studio2.Controllers; |
| | | 11 | | |
| | | 12 | | /// <summary> |
| | | 13 | | /// Диагностика поиска номенклатуры 1С: «почему так нашлось», ручная связь написаний бренда, отчёты по дублям и парам бр |
| | | 14 | | /// Только для администраторов. Explain и отчёты ничего не пишут и не создают карточек. |
| | | 15 | | /// </summary> |
| | | 16 | | [Authorize(Roles = "Admin,SuperAdmin")] |
| | | 17 | | [Area("Studio2")] |
| | | 18 | | [Route("Studio2/OneCNomenclature")] |
| | 12 | 19 | | public sealed class OneCNomenclatureController( |
| | 12 | 20 | | ApplicationDbContext db, |
| | 12 | 21 | | NomenclatureMatcher matcher, |
| | 12 | 22 | | IProducerDirectoryProvider directoryProvider, |
| | 12 | 23 | | INomenclatureIndexProvider indexProvider, |
| | 12 | 24 | | ProducerValueResolver producerValues, |
| | 12 | 25 | | IOneCNomenclatureMapStore mapStore, |
| | 12 | 26 | | IOneCNomenclatureService nomenclatureService, |
| | 12 | 27 | | ILogger<OneCNomenclatureController> logger) : Controller |
| | | 28 | | { |
| | | 29 | | private const int MaxReportRows = 200; |
| | | 30 | | |
| | 21 | 31 | | public sealed record LinkProducersRequest(string? AliasName, string? CanonicalName); |
| | | 32 | | |
| | | 33 | | /// <summary> |
| | | 34 | | /// Разбор поиска для заказа (<c>orderId</c>) или для введённых значений. Показывает разбор ключа, бренд, кандидатов |
| | | 35 | | /// индекса, статус, причину и решение политики в обоих режимах. |
| | | 36 | | /// </summary> |
| | | 37 | | [HttpGet("Explain")] |
| | | 38 | | public async Task<IActionResult> Explain(int? orderId, string? article, string? key, string? name, string? producer, |
| | | 39 | | { |
| | 4 | 40 | | if (orderId.HasValue) |
| | | 41 | | { |
| | 2 | 42 | | var order = await db.Orders.AsNoTracking().Include(o => o.EtProducer) |
| | 2 | 43 | | .FirstOrDefaultAsync(o => o.Id == orderId.Value, cancellationToken); |
| | 2 | 44 | | if (order == null) |
| | 1 | 45 | | return NotFound(new { success = false, message = "Заказ не найден." }); |
| | | 46 | | |
| | 1 | 47 | | article = order.Article; |
| | 1 | 48 | | key = order.ProductKey; |
| | 1 | 49 | | name = order.ProductName; |
| | 1 | 50 | | producer = order.EtProducer?.Name; |
| | | 51 | | } |
| | | 52 | | |
| | 3 | 53 | | var query = new ProductQuery(article, key, name, producer); |
| | 3 | 54 | | var match = await matcher.MatchAsync(query, nomenclatureService as INomenclatureLiveLookup, cancellationToken); |
| | 3 | 55 | | var directory = await directoryProvider.GetAsync(cancellationToken); |
| | | 56 | | |
| | 3 | 57 | | return Json(new |
| | 3 | 58 | | { |
| | 3 | 59 | | success = true, |
| | 3 | 60 | | query = new { article, key, name, producer }, |
| | 3 | 61 | | parsed = new |
| | 3 | 62 | | { |
| | 3 | 63 | | match.Parsed.ArticleRaw, |
| | 3 | 64 | | match.Parsed.ArticleClean, |
| | 3 | 65 | | match.Parsed.ArticleKey, |
| | 3 | 66 | | match.Parsed.ProductKeyArticleRaw, |
| | 3 | 67 | | match.Parsed.ProductKeyArticleClean, |
| | 3 | 68 | | match.Parsed.ProductKeyArticleKey, |
| | 3 | 69 | | match.Parsed.HasArticleConflict, |
| | 3 | 70 | | match.Parsed.BrandPrefix, |
| | 3 | 71 | | match.Parsed.BatchSize, |
| | 3 | 72 | | match.Parsed.BatchSizeFromArticle, |
| | 3 | 73 | | match.Parsed.VariantTag, |
| | 3 | 74 | | Flags = match.Parsed.Flags.ToString() |
| | 3 | 75 | | }, |
| | 3 | 76 | | brand = new |
| | 3 | 77 | | { |
| | 3 | 78 | | kind = match.Producer.Kind.ToString(), |
| | 3 | 79 | | source = match.Producer.Source, |
| | 3 | 80 | | groups = match.Producer.Groups.Select(g => new { group = g, names = directory.NamesOfGroup(g).Take(12) } |
| | 3 | 81 | | }, |
| | 3 | 82 | | status = match.Status.ToString(), |
| | 3 | 83 | | confidence = match.Confidence.ToString(), |
| | 3 | 84 | | reason = match.Reason, |
| | 3 | 85 | | refKey = match.RefKey, |
| | 3 | 86 | | variantKind = match.VariantKind?.ToString(), |
| | 3 | 87 | | duplicate = match.Duplicate, |
| | 3 | 88 | | producerlessCard = match.ProducerlessCard, |
| | 3 | 89 | | fromLiveLookup = match.FromLiveLookup, |
| | 3 | 90 | | candidates = match.Candidates.Select(c => new |
| | 3 | 91 | | { |
| | 3 | 92 | | c.RefKey, |
| | 3 | 93 | | producerName = c.ProducerName, |
| | 3 | 94 | | producerNorm = c.ProducerNorm, |
| | 3 | 95 | | c.RawArticle, |
| | 3 | 96 | | c.Source, |
| | 3 | 97 | | groups = c.Groups |
| | 3 | 98 | | }), |
| | 3 | 99 | | decisions = new |
| | 3 | 100 | | { |
| | 3 | 101 | | findOnly = NomenclatureResolvePolicy.Decide(match, NomenclatureMode.FindOnly).Action.ToString(), |
| | 3 | 102 | | findOrCreate = NomenclatureResolvePolicy.Decide(match, NomenclatureMode.FindOrCreate).Action.ToString() |
| | 3 | 103 | | } |
| | 3 | 104 | | }); |
| | 4 | 105 | | } |
| | | 106 | | |
| | | 107 | | /// <summary> |
| | | 108 | | /// Ручная связь написаний бренда: запись в <c>OneCProducerAliases</c> (источник <c>curated</c>). Каноническое имя д |
| | | 109 | | /// существовать среди значений реквизита «Производитель» в 1С, алиас — в справочнике производителей или в 1С. |
| | | 110 | | /// Работает через JSON-тело: кросс-сайтовая форма такой запрос отправить не может. |
| | | 111 | | /// </summary> |
| | | 112 | | [HttpPost("LinkProducers")] |
| | | 113 | | public async Task<IActionResult> LinkProducers([FromBody] LinkProducersRequest request, CancellationToken cancellati |
| | | 114 | | { |
| | 7 | 115 | | var alias = request.AliasName?.Trim(); |
| | 7 | 116 | | var canonical = request.CanonicalName?.Trim(); |
| | 7 | 117 | | if (string.IsNullOrEmpty(alias) || string.IsNullOrEmpty(canonical)) |
| | 3 | 118 | | return BadRequest(new { success = false, message = "Нужны оба имени бренда." }); |
| | | 119 | | |
| | 4 | 120 | | var aliasNorm = OneCNomenclatureService.NormalizeProducerName(alias); |
| | 4 | 121 | | if (aliasNorm.Length == 0 || ArticleKey.Key(alias) == ArticleKey.Key(canonical)) |
| | 1 | 122 | | return BadRequest(new { success = false, message = "Имена совпадают — связывать нечего." }); |
| | | 123 | | |
| | 3 | 124 | | var target = await producerValues.FindByNameAsync(canonical, cancellationToken); |
| | 3 | 125 | | if (target == null) |
| | 1 | 126 | | return BadRequest(new { success = false, message = $"В 1С нет значения «Производитель» «{canonical}»." }); |
| | | 127 | | |
| | 2 | 128 | | var directory = await directoryProvider.GetAsync(cancellationToken); |
| | 2 | 129 | | var aliasKnown = directory.GroupsOfName(alias).Count > 0 || await producerValues.FindByNameAsync(alias, cancella |
| | 2 | 130 | | if (!aliasKnown) |
| | 1 | 131 | | return BadRequest(new { success = false, message = $"Бренд «{alias}» не найден ни в справочнике производител |
| | | 132 | | |
| | 1 | 133 | | await mapStore.UpsertProducerAliasAsync(aliasNorm, target.RefKey, target.Name, "curated", cancellationToken); |
| | 1 | 134 | | directoryProvider.Invalidate(); |
| | 1 | 135 | | indexProvider.Invalidate(); |
| | 1 | 136 | | matcher.ForgetMisses(); |
| | | 137 | | |
| | 1 | 138 | | logger.LogInformation("[NomenclatureLink] {User} связал бренд «{Alias}» с «{Canonical}» ({RefKey})", |
| | 1 | 139 | | User.Identity?.Name, alias, target.Name, target.RefKey); |
| | 1 | 140 | | return Json(new { success = true, alias = aliasNorm, canonical = target.Name, refKey = target.RefKey }); |
| | 7 | 141 | | } |
| | | 142 | | |
| | | 143 | | /// <summary>Артикулы, у которых в одной группе бренда больше одной карточки, — кандидаты на слияние.</summary> |
| | | 144 | | [HttpGet("Report/Duplicates")] |
| | | 145 | | public async Task<IActionResult> Duplicates(CancellationToken cancellationToken) |
| | | 146 | | { |
| | 1 | 147 | | var index = await indexProvider.GetAsync(cancellationToken); |
| | 1 | 148 | | var rows = new List<object>(); |
| | 1 | 149 | | var total = 0; |
| | 11 | 150 | | foreach (var (articleKey, cards) in index.Articles().OrderBy(a => a.Key, StringComparer.Ordinal)) |
| | | 151 | | { |
| | 3 | 152 | | if (cards.Count < 2 || !HasDuplicateGroup(cards)) |
| | | 153 | | continue; |
| | | 154 | | |
| | 1 | 155 | | total++; |
| | 1 | 156 | | if (rows.Count < MaxReportRows) |
| | 1 | 157 | | rows.Add(new |
| | 1 | 158 | | { |
| | 1 | 159 | | articleKey, |
| | 2 | 160 | | cards = cards.Select(c => new { c.RefKey, c.ProducerName, c.Source, c.RawArticle }) |
| | 1 | 161 | | }); |
| | | 162 | | } |
| | | 163 | | |
| | 1 | 164 | | return Json(new { success = true, total, shown = rows.Count, rows }); |
| | 1 | 165 | | } |
| | | 166 | | |
| | | 167 | | /// <summary> |
| | | 168 | | /// Самые частые пары «бренд заказа ↔ бренд карточки», по которым поиск вернул «другой бренд», среди последних заказ |
| | | 169 | | /// Кандидаты на ручную связь. Карточки 1С по живому запросу не читаются — только индекс. |
| | | 170 | | /// </summary> |
| | | 171 | | [HttpGet("Report/BrandPairs")] |
| | | 172 | | public async Task<IActionResult> BrandPairs(int take = 20000, CancellationToken cancellationToken = default) |
| | | 173 | | { |
| | 1 | 174 | | take = Math.Clamp(take, 100, 100000); |
| | 1 | 175 | | var orders = await db.Orders.AsNoTracking() |
| | 1 | 176 | | .OrderByDescending(o => o.Id) |
| | 1 | 177 | | .Take(take) |
| | 1 | 178 | | .Select(o => new { o.Id, o.Article, o.ProductKey, o.ProductName, Producer = o.EtProducer != null ? o.EtProdu |
| | 1 | 179 | | .ToListAsync(cancellationToken); |
| | | 180 | | |
| | 1 | 181 | | var pairs = new Dictionary<(string Order, string Cards), (int Count, string Article, int OrderId)>(); |
| | 8 | 182 | | foreach (var order in orders) |
| | | 183 | | { |
| | 3 | 184 | | var match = await matcher.MatchAsync(new ProductQuery(order.Article, order.ProductKey, order.ProductName, or |
| | 3 | 185 | | if (match.Status != NomenclatureMatchStatus.BrandMismatch) |
| | | 186 | | continue; |
| | | 187 | | |
| | 2 | 188 | | var orderBrand = string.IsNullOrWhiteSpace(order.Producer) ? match.Parsed.BrandPrefix : order.Producer!.Trim |
| | 2 | 189 | | var cardBrands = string.Join(" / ", match.Candidates |
| | 2 | 190 | | .Select(c => string.IsNullOrWhiteSpace(c.ProducerName) ? c.ProducerNorm : c.ProducerName!.Trim()) |
| | 2 | 191 | | .Distinct(StringComparer.OrdinalIgnoreCase)); |
| | 2 | 192 | | var pairKey = (orderBrand, cardBrands); |
| | 2 | 193 | | pairs[pairKey] = pairs.TryGetValue(pairKey, out var known) |
| | 2 | 194 | | ? (known.Count + 1, known.Article, known.OrderId) |
| | 2 | 195 | | : (1, match.Parsed.ArticleClean, order.Id); |
| | 2 | 196 | | } |
| | | 197 | | |
| | 2 | 198 | | var rows = pairs.OrderByDescending(p => p.Value.Count).Take(MaxReportRows) |
| | 2 | 199 | | .Select(p => new { orderBrand = p.Key.Order, cardBrands = p.Key.Cards, count = p.Value.Count, exampleArticle |
| | 2 | 200 | | return Json(new { success = true, scannedOrders = orders.Count, totalPairs = pairs.Count, totalMismatches = pair |
| | 1 | 201 | | } |
| | | 202 | | |
| | | 203 | | private static bool HasDuplicateGroup(IReadOnlyList<IndexedCard> cards) |
| | | 204 | | { |
| | 8 | 205 | | for (var i = 0; i < cards.Count; i++) |
| | | 206 | | { |
| | 8 | 207 | | for (var j = i + 1; j < cards.Count; j++) |
| | | 208 | | { |
| | 2 | 209 | | var a = cards[i]; |
| | 2 | 210 | | var b = cards[j]; |
| | 2 | 211 | | if (a.RefKey == b.RefKey) |
| | | 212 | | continue; |
| | 2 | 213 | | if (a.Groups.Count > 0 && a.Groups.Overlaps(b.Groups)) |
| | 1 | 214 | | return true; |
| | | 215 | | } |
| | | 216 | | } |
| | | 217 | | |
| | 1 | 218 | | return false; |
| | | 219 | | } |
| | | 220 | | } |