| | | 1 | | using Services.SystemMonitoringServices; |
| | | 2 | | using Microsoft.Extensions.Logging; |
| | | 3 | | using OzonDomains; |
| | | 4 | | using OzonDomains.Models; |
| | | 5 | | using Services.ApiServices; |
| | | 6 | | using Services.ApiServices._1CApi.DTO; |
| | | 7 | | using Services.ApiServices._1CApi.Models; |
| | | 8 | | using Services.ApiServices._1CApi.Nomenclature; |
| | | 9 | | using Services.OneCServices; |
| | | 10 | | using Services.ApiServices._1CApi.OData; |
| | | 11 | | using Services.ApiServices._1CApi.OData.Models; |
| | | 12 | | |
| | | 13 | | namespace Services.ApiServices._1CApi; |
| | | 14 | | |
| | | 15 | | public class OneCReceiptManager : IApiDataManager<OneCReceiptManager> |
| | | 16 | | { |
| | | 17 | | private readonly IOneCODataReferenceService _referenceService; |
| | | 18 | | private readonly IOneCODataClient _odataClient; |
| | | 19 | | private readonly IOneCNomenclatureService _nomenclatureService; |
| | | 20 | | private readonly OneCReceiptDuplicateFinder _duplicateFinder; |
| | | 21 | | private readonly ISystemMonitoringSignalWriter? _signals; |
| | | 22 | | private readonly IOneCPostingFailureReporter? _failureReporter; |
| | | 23 | | private readonly ILogger<OneCReceiptManager> _logger; |
| | | 24 | | private const string ZasylKey = "Засыл"; |
| | | 25 | | |
| | | 26 | | private const string ReceiptEndpoint = "Document_ПриходнаяНакладная"; |
| | | 27 | | |
| | | 28 | | /// <summary> |
| | | 29 | | /// PurchasePrice — цена за заказанную единицу (для ARTICLE=BRAND[N] — за партию из N шт.), а в 1С количество |
| | | 30 | | /// идёт в штуках (<see cref="Order.TrueQuantity"/>). Цена строки приводится к цене за штуку, |
| | | 31 | | /// сумма равна PurchasePrice × число заказанных единиц. |
| | | 32 | | /// </summary> |
| | | 33 | | public static (decimal Price, decimal Amount) CalculateLinePrice(Order order, decimal qty) |
| | | 34 | | { |
| | 4 | 35 | | var packSize = order.Quantity is > 0 && order.TrueQuantity is > 0 |
| | 4 | 36 | | ? (decimal)order.TrueQuantity.Value / order.Quantity.Value |
| | 4 | 37 | | : 1m; |
| | 4 | 38 | | var purchasePrice = order.PurchasePrice ?? 0m; |
| | 4 | 39 | | return packSize > 1m |
| | 4 | 40 | | ? (Math.Round(purchasePrice / packSize, 4), purchasePrice * order.Quantity!.Value) |
| | 4 | 41 | | : (purchasePrice, purchasePrice * qty); |
| | | 42 | | } |
| | | 43 | | |
| | 0 | 44 | | public OneCReceiptManager( |
| | 0 | 45 | | IOneCODataReferenceService referenceService, |
| | 0 | 46 | | IOneCODataClient odataClient, |
| | 0 | 47 | | IOneCNomenclatureService nomenclatureService, |
| | 0 | 48 | | ILogger<OneCReceiptManager> logger, |
| | 0 | 49 | | ISystemMonitoringSignalWriter? signals = null, |
| | 0 | 50 | | IOneCPostingFailureReporter? failureReporter = null) |
| | | 51 | | { |
| | 0 | 52 | | _signals = signals; |
| | 0 | 53 | | _failureReporter = failureReporter; |
| | 0 | 54 | | _referenceService = referenceService; |
| | 0 | 55 | | _odataClient = odataClient; |
| | 0 | 56 | | _nomenclatureService = nomenclatureService; |
| | 0 | 57 | | _logger = logger; |
| | 0 | 58 | | _duplicateFinder = new OneCReceiptDuplicateFinder(odataClient, logger); |
| | 0 | 59 | | } |
| | | 60 | | |
| | | 61 | | public async Task<List<OneCResponse>> CreateReceipts( |
| | | 62 | | List<Order> ordersToReceipt, |
| | | 63 | | ShippedBySupplierTransactionDto dto, |
| | | 64 | | string? userName = null, |
| | | 65 | | string? orgInnOverride = null) |
| | | 66 | | { |
| | 0 | 67 | | if (ordersToReceipt == null || !ordersToReceipt.Any()) |
| | 0 | 68 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 69 | | |
| | 0 | 70 | | var distinctEffectiveWarehouses = ordersToReceipt |
| | 0 | 71 | | .Select(GetEffectiveWarehouseName) |
| | 0 | 72 | | .Where(x => !string.IsNullOrWhiteSpace(x)) |
| | 0 | 73 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 74 | | .ToList(); |
| | | 75 | | |
| | 0 | 76 | | if (distinctEffectiveWarehouses.Count > 1) |
| | 0 | 77 | | throw new ArgumentException($"Заказы имеют различные эффективные склады: {string.Join(", ", distinctEffectiv |
| | 0 | 78 | | if (distinctEffectiveWarehouses.Count == 0) |
| | 0 | 79 | | throw new ArgumentException("Не указан эффективный склад для заказов."); |
| | | 80 | | |
| | 0 | 81 | | var distinctSupplierInns = ordersToReceipt |
| | 0 | 82 | | .Where(o => o.Supplier != null && !string.IsNullOrEmpty(o.Supplier.INNCode)) |
| | 0 | 83 | | .Select(o => o.Supplier!.INNCode!) |
| | 0 | 84 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 85 | | .ToList(); |
| | | 86 | | |
| | 0 | 87 | | if (distinctSupplierInns.Count == 0) |
| | 0 | 88 | | throw new ArgumentException("Не задан ИНН для поставщика."); |
| | 0 | 89 | | if (distinctSupplierInns.Count > 1) |
| | 0 | 90 | | throw new ArgumentException($"Заказы имеют различных поставщиков: {string.Join(", ", distinctSupplierInns)}" |
| | | 91 | | |
| | 0 | 92 | | if (string.IsNullOrWhiteSpace(dto.ContractLink)) |
| | 0 | 93 | | throw new ArgumentException("Не указана ссылка (GUID) договора."); |
| | | 94 | | |
| | 0 | 95 | | var warehouseName = distinctEffectiveWarehouses[0]!; |
| | 0 | 96 | | var supplierInn = distinctSupplierInns[0]; |
| | | 97 | | |
| | | 98 | | // Резолвинг контрагента (поставщика) по ИНН |
| | 0 | 99 | | var counterpartyGuid = await _referenceService.GetCounterpartyGuidByInnAsync(supplierInn); |
| | 0 | 100 | | if (counterpartyGuid == null) |
| | | 101 | | { |
| | 0 | 102 | | await (_signals?.RecordAsync("onec-supplier", "failure", "counterparty-missing", |
| | 0 | 103 | | $"Поставщик с ИНН {supplierInn} не найден в справочнике контрагентов 1С") ?? Task.CompletedTask); |
| | | 104 | | } |
| | | 105 | | |
| | 0 | 106 | | if (counterpartyGuid == null) |
| | 0 | 107 | | return new List<OneCResponse> { new OneCResponse { Success = false, |
| | 0 | 108 | | Message = $"Поставщик с ИНН '{supplierInn}' не найден в справочнике контрагентов 1С. Добавьте ИНН в Cata |
| | | 109 | | |
| | | 110 | | // Резолвинг склада-источника (засыл/склад) |
| | 0 | 111 | | var warehouseGuid = await _referenceService.GetWarehouseGuidByNameAsync(warehouseName); |
| | 0 | 112 | | if (warehouseGuid == null) |
| | 0 | 113 | | return new List<OneCResponse> { new OneCResponse { Success = false, |
| | 0 | 114 | | Message = $"Склад '{warehouseName}' не найден в справочнике складов 1С (Catalog_СтруктурныеЕдиницы)." } |
| | | 115 | | |
| | | 116 | | // Резолвинг договора |
| | 0 | 117 | | Guid? contractGuid = null; |
| | 0 | 118 | | if (Guid.TryParse(dto.ContractLink, out var parsedContract)) |
| | 0 | 119 | | contractGuid = parsedContract; |
| | | 120 | | |
| | | 121 | | // Резолвинг ставки НДС |
| | 0 | 122 | | var vatGuid = dto.VatRate.HasValue |
| | 0 | 123 | | ? await _referenceService.GetVatRateGuidByRateAsync(dto.VatRate.Value) |
| | 0 | 124 | | : await _referenceService.GetNoVatRateGuidAsync(); |
| | 0 | 125 | | var noVatGuid = await _referenceService.GetNoVatRateGuidAsync(); |
| | | 126 | | |
| | 0 | 127 | | var ordersByClient = ordersToReceipt |
| | 0 | 128 | | .Where(o => o.OzonClient != null) |
| | 0 | 129 | | .GroupBy(o => o.OzonClient!) |
| | 0 | 130 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 131 | | |
| | 0 | 132 | | if (!ordersByClient.Any()) |
| | 0 | 133 | | throw new ArgumentException("Не найдено заказов с валидными данными клиента Ozon."); |
| | | 134 | | |
| | 0 | 135 | | var results = new List<OneCResponse>(); |
| | 0 | 136 | | var tz = TimeZoneInfo.FindSystemTimeZoneById("Russian Standard Time"); |
| | 0 | 137 | | var docDate = TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, tz) |
| | 0 | 138 | | .ToString("yyyy-MM-ddTHH:mm:ss"); |
| | 0 | 139 | | var incomingDate = dto.DateVh.ToString("yyyy-MM-ddTHH:mm:ss"); |
| | | 140 | | |
| | 0 | 141 | | foreach (var (client, orders) in ordersByClient) |
| | | 142 | | { |
| | 0 | 143 | | var recipientWarehouseName = ResolveRecipientWarehouseName(dto.ReceiptWarehouseName, client.WarehouseName); |
| | 0 | 144 | | if (string.IsNullOrEmpty(client.INNCode) || string.IsNullOrEmpty(recipientWarehouseName)) |
| | | 145 | | { |
| | 0 | 146 | | results.Add(new OneCResponse { Success = false, |
| | 0 | 147 | | Message = $"Клиент '{client.Name}' не имеет обязательных данных (ИНН или склад). Заполните в /Studio |
| | 0 | 148 | | continue; |
| | | 149 | | } |
| | | 150 | | |
| | | 151 | | // Override → явный выбор пользователя; иначе всегда "0000000000" (Interparts) |
| | 0 | 152 | | var effectiveOrgInn = !string.IsNullOrWhiteSpace(orgInnOverride) ? orgInnOverride.Trim() : "0000000000"; |
| | 0 | 153 | | var orgGuid = await _referenceService.GetOrganizationGuidByInnAsync(effectiveOrgInn); |
| | 0 | 154 | | if (orgGuid == null) |
| | | 155 | | { |
| | 0 | 156 | | results.Add(new OneCResponse { Success = false, |
| | 0 | 157 | | Message = $"Организация с ИНН '{effectiveOrgInn}' не найдена в справочнике организаций 1С. Добавьте |
| | 0 | 158 | | continue; |
| | | 159 | | } |
| | | 160 | | |
| | | 161 | | // Склад-получатель: выбранный в форме, иначе склад клиента из настроек |
| | 0 | 162 | | var recipientWarehouseGuid = await _referenceService.GetWarehouseGuidByNameAsync(recipientWarehouseName); |
| | 0 | 163 | | if (recipientWarehouseGuid == null) |
| | | 164 | | { |
| | 0 | 165 | | results.Add(new OneCResponse { Success = false, |
| | 0 | 166 | | Message = string.IsNullOrWhiteSpace(dto.ReceiptWarehouseName) |
| | 0 | 167 | | ? $"Склад клиента '{recipientWarehouseName}' не найден в 1С (Catalog_СтруктурныеЕдиницы). Провер |
| | 0 | 168 | | : $"Склад прихода '{recipientWarehouseName}' не найден в 1С (Catalog_СтруктурныеЕдиницы). Выбери |
| | 0 | 169 | | continue; |
| | | 170 | | } |
| | | 171 | | |
| | 0 | 172 | | var missingItems = new List<(string Article, string? ProductName, decimal Qty)>(); |
| | 0 | 173 | | var createdNomenclature = new List<string>(); |
| | | 174 | | |
| | | 175 | | // Номенклатура для разных позиций разрешается параллельно (GetOrCreateManyAsync) — |
| | | 176 | | // последовательные вызовы GetOrCreateAsync в цикле давали 7-11 HTTP-запросов к 1С |
| | | 177 | | // на КАЖДУЮ новую позицию строго друг за другом. |
| | 0 | 178 | | var validOrders = orders |
| | 0 | 179 | | .Where(o => !string.IsNullOrEmpty(o.Article) && o.Quantity.HasValue && o.Quantity.Value > 0) |
| | 0 | 180 | | .ToList(); |
| | 0 | 181 | | var countryGuidTasks = validOrders |
| | 0 | 182 | | .Select(order => dto.OrderCountryMap.TryGetValue(order.Id, out var country) |
| | 0 | 183 | | ? _referenceService.GetCountryGuidByNameAsync(country) |
| | 0 | 184 | | : Task.FromResult<Guid?>(null)) |
| | 0 | 185 | | .ToArray(); |
| | 0 | 186 | | var gtdGuidTasks = validOrders |
| | 0 | 187 | | .Select(order => dto.OrderGtdMap.TryGetValue(order.Id, out var gtd) |
| | 0 | 188 | | ? ResolveGtdGuidAsync(gtd) |
| | 0 | 189 | | : Task.FromResult<Guid?>(null)) |
| | 0 | 190 | | .ToArray(); |
| | 0 | 191 | | var countryGuids = await Task.WhenAll(countryGuidTasks); |
| | 0 | 192 | | var gtdGuids = await Task.WhenAll(gtdGuidTasks); |
| | 0 | 193 | | var invalidOriginData = validOrders |
| | 0 | 194 | | .Select((order, index) => new { order.Article, Country = countryGuids[index], Gtd = gtdGuids[index] }) |
| | 0 | 195 | | .Where(item => item.Country == null || item.Gtd == null) |
| | 0 | 196 | | .Select(item => item.Article) |
| | 0 | 197 | | .ToList(); |
| | 0 | 198 | | if (invalidOriginData.Count > 0) |
| | | 199 | | { |
| | 0 | 200 | | results.Add(new OneCResponse |
| | 0 | 201 | | { |
| | 0 | 202 | | Success = false, |
| | 0 | 203 | | Message = $"Не найдена страна происхождения или номер ГТД в 1С для артикулов: {string.Join(", ", inv |
| | 0 | 204 | | }); |
| | 0 | 205 | | continue; |
| | | 206 | | } |
| | | 207 | | |
| | 0 | 208 | | var resolutions = await _nomenclatureService.ResolveManyAsync( |
| | 0 | 209 | | validOrders, NomenclatureMode.FindOrCreate, origin: new OneCNomenclatureOrigin(TransactionType.ShippedBy |
| | 0 | 210 | | var missingReasons = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 211 | | var nomenclatureNotes = new List<string>(); |
| | | 212 | | |
| | 0 | 213 | | var lines = new List<ODataReceiptLine>(); |
| | 0 | 214 | | var lineNum = 1; |
| | 0 | 215 | | for (var i = 0; i < validOrders.Count; i++) |
| | | 216 | | { |
| | 0 | 217 | | var order = validOrders[i]; |
| | 0 | 218 | | var resolution = resolutions[i]; |
| | 0 | 219 | | if (resolution.Created) |
| | 0 | 220 | | createdNomenclature.Add(resolution.DisplayName); |
| | 0 | 221 | | if (resolution.FoundByVariant && !string.IsNullOrWhiteSpace(resolution.Reason)) |
| | 0 | 222 | | nomenclatureNotes.Add($"{order.Article}: {resolution.Reason}"); |
| | | 223 | | // validOrders уже отфильтрован по Quantity.HasValue выше. |
| | 0 | 224 | | var qty = (decimal)(order.TrueQuantity ?? order.Quantity!.Value); |
| | 0 | 225 | | if (!resolution.RefKey.HasValue) |
| | | 226 | | { |
| | 0 | 227 | | missingItems.Add((order.Article ?? string.Empty, order.ProductName, qty)); |
| | 0 | 228 | | NomenclatureResolution.NoteReason(missingReasons, order.Article ?? string.Empty, resolution.Reason); |
| | 0 | 229 | | continue; |
| | | 230 | | } |
| | | 231 | | |
| | 0 | 232 | | var (price, amount) = CalculateLinePrice(order, qty); |
| | 0 | 233 | | var vatAmount = dto.VatRate.HasValue |
| | 0 | 234 | | ? amount * (dto.VatRate.Value / 100m) |
| | 0 | 235 | | : 0m; |
| | 0 | 236 | | var effectiveVatGuid = vatGuid ?? noVatGuid ?? Guid.Empty; |
| | | 237 | | |
| | 0 | 238 | | lines.Add(new ODataReceiptLine |
| | 0 | 239 | | { |
| | 0 | 240 | | LineNumber = lineNum++, |
| | 0 | 241 | | NomenclatureKey = resolution.RefKey.Value, |
| | 0 | 242 | | CountryOfOriginKey = countryGuids[i], |
| | 0 | 243 | | GtdNumberKey = gtdGuids[i], |
| | 0 | 244 | | WarehouseKey = recipientWarehouseGuid!.Value, |
| | 0 | 245 | | Quantity = qty, |
| | 0 | 246 | | Price = price, |
| | 0 | 247 | | Amount = amount, |
| | 0 | 248 | | VatRateKey = effectiveVatGuid, |
| | 0 | 249 | | VatAmount = vatAmount, |
| | 0 | 250 | | TotalAmount = amount + vatAmount |
| | 0 | 251 | | }); |
| | | 252 | | } |
| | | 253 | | |
| | 0 | 254 | | if (!lines.Any() && !missingItems.Any()) |
| | | 255 | | { |
| | 0 | 256 | | var msg = $"Для клиента '{client.Name}' не найдено товаров с валидными данными."; |
| | 0 | 257 | | _logger.LogWarning("[OData] {Msg}", msg); |
| | 0 | 258 | | results.Add(new OneCResponse { Success = false, Message = msg }); |
| | 0 | 259 | | continue; |
| | | 260 | | } |
| | | 261 | | |
| | 0 | 262 | | var transactionTitle = BuildTransactionTitle(TransactionType.ShippedBySupplier, userName); |
| | 0 | 263 | | var baseComment = string.IsNullOrWhiteSpace(dto.TransactionComment) |
| | 0 | 264 | | ? transactionTitle |
| | 0 | 265 | | : $"{transactionTitle}. {dto.TransactionComment.Trim()}"; |
| | | 266 | | |
| | 0 | 267 | | var request = new ODataReceiptRequest |
| | 0 | 268 | | { |
| | 0 | 269 | | Date = docDate, |
| | 0 | 270 | | IncomingDocNumber = dto.NumberVh?.Trim() ?? string.Empty, |
| | 0 | 271 | | IncomingDocDate = incomingDate, |
| | 0 | 272 | | OrganizationKey = orgGuid!.Value, |
| | 0 | 273 | | CounterpartyKey = counterpartyGuid!.Value, |
| | 0 | 274 | | ContractKey = contractGuid, |
| | 0 | 275 | | WarehouseKey = recipientWarehouseGuid!.Value, |
| | 0 | 276 | | AmountIncludesVat = false, |
| | 0 | 277 | | Lines = lines |
| | 0 | 278 | | }; |
| | | 279 | | |
| | | 280 | | // Повтор проведения или ретрай после таймаута не должен плодить вторую накладную: если такая уже есть |
| | | 281 | | // в 1С, возвращаем её, а новый документ не создаём. |
| | 0 | 282 | | var existing = await _duplicateFinder.FindAsync( |
| | 0 | 283 | | request.IncomingDocNumber, request.CounterpartyKey, request.WarehouseKey, lines); |
| | 0 | 284 | | if (existing != null) |
| | | 285 | | { |
| | 0 | 286 | | _logger.LogInformation( |
| | 0 | 287 | | "[OData] Приходная с входящим № {IncomingNumber} (контрагент {Counterparty}) уже есть в 1С: {Number} |
| | 0 | 288 | | request.IncomingDocNumber, request.CounterpartyKey, existing.Number, existing.RefKey); |
| | 0 | 289 | | results.Add(BuildExistingReceiptResponse(existing, request, missingItems, createdNomenclature, nomenclat |
| | 0 | 290 | | continue; |
| | | 291 | | } |
| | | 292 | | |
| | 0 | 293 | | var response = await CreateAndPostReceiptAsync(request, missingItems, baseComment, createdNomenclature, miss |
| | 0 | 294 | | _failureReporter?.Report(response, "Приход от поставщика: приходная накладная", orders); |
| | 0 | 295 | | results.Add(response); |
| | 0 | 296 | | } |
| | | 297 | | |
| | 0 | 298 | | return results; |
| | 0 | 299 | | } |
| | | 300 | | |
| | | 301 | | private async Task<OneCResponse> CreateAndPostReceiptAsync( |
| | | 302 | | ODataReceiptRequest request, |
| | | 303 | | List<(string Article, string? ProductName, decimal Qty)> missingItems, |
| | | 304 | | string baseComment, |
| | | 305 | | List<string> createdNomenclature, |
| | | 306 | | IReadOnlyDictionary<string, string> missingReasons, |
| | | 307 | | List<string> nomenclatureNotes) |
| | | 308 | | { |
| | | 309 | | const string operationLabel = "создании приходной накладной"; |
| | | 310 | | try |
| | | 311 | | { |
| | 0 | 312 | | string? missingNomStr = null; |
| | 0 | 313 | | if (missingItems.Any()) |
| | | 314 | | { |
| | 0 | 315 | | missingNomStr = string.Join(", ", missingItems.Select(i => FormatMissingItem(i) + NomenclatureResolution |
| | 0 | 316 | | var allMissing = (request.Lines ?? []).Count == 0; |
| | 0 | 317 | | var draftReason = allMissing |
| | 0 | 318 | | ? $"⚠ Черновик (все позиции без номенклатуры 1С) — {missingNomStr}" |
| | 0 | 319 | | : $"⚠ Черновик — не найдена номенклатура: {missingNomStr}"; |
| | 0 | 320 | | request.Comment = $"{baseComment}\n{draftReason}"; |
| | | 321 | | // Создание черновика при нехватке номенклатуры — штатный бизнес-сценарий: |
| | | 322 | | // документ сохраняется в 1С как черновик, а пользователю выводится всплывающее |
| | | 323 | | // уведомление (OneCResponse.Message / TempData["TransactionResult"]). |
| | | 324 | | // Уровень Information, чтобы не спамить в errors-*.log и не заводить issues. |
| | 0 | 325 | | _logger.LogInformation("[OData] Создаём черновик приходной{Suffix}: не найдена номенклатура для {Missing |
| | 0 | 326 | | allMissing ? " (все позиции)" : "", missingNomStr); |
| | | 327 | | } |
| | | 328 | | else |
| | | 329 | | { |
| | 0 | 330 | | request.Comment = baseComment; |
| | | 331 | | } |
| | | 332 | | |
| | 0 | 333 | | var doc = await _odataClient.PostAsync<ODataReceiptRequest, ODataDocumentResponse>( |
| | 0 | 334 | | ReceiptEndpoint, request); |
| | | 335 | | |
| | 0 | 336 | | bool isPosted = false; |
| | 0 | 337 | | string? postingError = null; |
| | 0 | 338 | | string? errorDetail = null; |
| | 0 | 339 | | string docNumber = doc.Number ?? ""; |
| | | 340 | | |
| | 0 | 341 | | if (missingItems.Any()) |
| | | 342 | | { |
| | 0 | 343 | | var fetched = await _odataClient.GetByGuidAsync<ODataDocumentResponse>(ReceiptEndpoint, doc.RefKey); |
| | 0 | 344 | | if (fetched != null && !string.IsNullOrWhiteSpace(fetched.Number)) |
| | 0 | 345 | | docNumber = fetched.Number; |
| | 0 | 346 | | _logger.LogInformation("[OData] Приходная {Number} ({Guid}) — черновик, не найдена номенклатура", docNum |
| | | 347 | | } |
| | | 348 | | else |
| | | 349 | | { |
| | | 350 | | try |
| | | 351 | | { |
| | 0 | 352 | | await _odataClient.PostDocumentAsync(ReceiptEndpoint, doc.RefKey); |
| | 0 | 353 | | isPosted = true; |
| | 0 | 354 | | var fetched = await _odataClient.GetByGuidAsync<ODataDocumentResponse>(ReceiptEndpoint, doc.RefKey); |
| | 0 | 355 | | if (fetched != null && !string.IsNullOrWhiteSpace(fetched.Number)) |
| | 0 | 356 | | docNumber = fetched.Number; |
| | 0 | 357 | | } |
| | | 358 | | // Отказ 1С провести документ — ожидаемый бизнес-исход (обычно не хватает |
| | | 359 | | // остатка): документ остаётся черновиком, а готовая причина уходит пользователю |
| | | 360 | | // в алерт транзакции. Это не сбой интеграции, поэтому Information: Warning и Error |
| | | 361 | | // попадают в errors-*.log и заводят автоматический issue на штатную ситуацию. |
| | 0 | 362 | | catch (OneCDocumentPostingException postingEx) |
| | | 363 | | { |
| | 0 | 364 | | postingError = postingEx.Message; |
| | 0 | 365 | | errorDetail = OneCResponseErrors.Describe(postingEx); |
| | 0 | 366 | | _logger.LogInformation("[OData] 1С не провела приходной {Guid}: {Reason}", doc.RefKey, postingEx.Det |
| | 0 | 367 | | } |
| | 0 | 368 | | catch (Exception patchEx) |
| | | 369 | | { |
| | 0 | 370 | | postingError = patchEx.Message; |
| | 0 | 371 | | errorDetail = OneCResponseErrors.Describe(patchEx); |
| | 0 | 372 | | _logger.LogError(patchEx, "[OData] Ошибка проведения приходной {Guid}", doc.RefKey); |
| | 0 | 373 | | } |
| | | 374 | | } |
| | | 375 | | |
| | | 376 | | string message; |
| | 0 | 377 | | if (missingItems.Any()) |
| | | 378 | | { |
| | 0 | 379 | | var allMissing = (request.Lines ?? []).Count == 0; |
| | 0 | 380 | | message = allMissing |
| | 0 | 381 | | ? $"Приходная {docNumber} создана как черновик — все позиции без номенклатуры 1С: {missingNomStr}" |
| | 0 | 382 | | : $"Приходная {docNumber} создана как черновик — не найдена номенклатура: {missingNomStr}"; |
| | | 383 | | } |
| | | 384 | | else |
| | | 385 | | { |
| | 0 | 386 | | message = isPosted |
| | 0 | 387 | | ? $"Приходная накладная {docNumber} создана и проведена" |
| | 0 | 388 | | : $"Приходная накладная {docNumber} создана, проведение не выполнено: {postingError}"; |
| | | 389 | | } |
| | | 390 | | |
| | 0 | 391 | | return new OneCResponse |
| | 0 | 392 | | { |
| | 0 | 393 | | Success = true, |
| | 0 | 394 | | Message = message, |
| | 0 | 395 | | TransactionId = doc.RefKey.ToString(), |
| | 0 | 396 | | DocumentNumber = string.IsNullOrWhiteSpace(docNumber) ? null : docNumber, |
| | 0 | 397 | | IsPosted = isPosted, |
| | 0 | 398 | | MissingNomenclature = missingNomStr, |
| | 0 | 399 | | CreatedNomenclature = string.Join(", ", createdNomenclature.Distinct(StringComparer.OrdinalIgnoreCase)), |
| | 0 | 400 | | PostingError = postingError, |
| | 0 | 401 | | ErrorDetail = errorDetail, |
| | 0 | 402 | | NomenclatureNotes = nomenclatureNotes.Count > 0 ? nomenclatureNotes : null |
| | 0 | 403 | | }; |
| | | 404 | | } |
| | 0 | 405 | | catch (Exception ex) |
| | | 406 | | { |
| | 0 | 407 | | var msg = $"Ошибка при {operationLabel}: {ex.Message}"; |
| | 0 | 408 | | _logger.LogError(ex, "[OData] {Msg}", msg); |
| | 0 | 409 | | return new OneCResponse { Success = false, Message = msg, ErrorDetail = OneCResponseErrors.Describe(ex) }; |
| | | 410 | | } |
| | 0 | 411 | | } |
| | | 412 | | |
| | | 413 | | private static OneCResponse BuildExistingReceiptResponse( |
| | | 414 | | ExistingReceipt existing, |
| | | 415 | | ODataReceiptRequest request, |
| | | 416 | | List<(string Article, string? ProductName, decimal Qty)> missingItems, |
| | | 417 | | List<string> createdNomenclature, |
| | | 418 | | List<string> nomenclatureNotes) |
| | | 419 | | { |
| | 0 | 420 | | var state = existing.Posted ? "проведена" : "не проведена — проведите её в 1С вручную"; |
| | 0 | 421 | | return new OneCResponse |
| | 0 | 422 | | { |
| | 0 | 423 | | Success = true, |
| | 0 | 424 | | Message = $"Приходная накладная {existing.Number} с входящим № {request.IncomingDocNumber} уже есть в 1С ({s |
| | 0 | 425 | | TransactionId = existing.RefKey.ToString(), |
| | 0 | 426 | | DocumentNumber = string.IsNullOrWhiteSpace(existing.Number) ? null : existing.Number, |
| | 0 | 427 | | IsPosted = existing.Posted, |
| | 0 | 428 | | MissingNomenclature = missingItems.Count > 0 ? string.Join(", ", missingItems.Select(FormatMissingItem)) : n |
| | 0 | 429 | | CreatedNomenclature = string.Join(", ", createdNomenclature.Distinct(StringComparer.OrdinalIgnoreCase)), |
| | 0 | 430 | | NomenclatureNotes = nomenclatureNotes.Count > 0 ? nomenclatureNotes : null |
| | 0 | 431 | | }; |
| | | 432 | | } |
| | | 433 | | |
| | | 434 | | /// <summary>Склад прихода: выбранный пользователем важнее склада клиента из настроек.</summary> |
| | | 435 | | public static string? ResolveRecipientWarehouseName(string? chosen, string? clientWarehouse) |
| | 7 | 436 | | => !string.IsNullOrWhiteSpace(chosen) ? chosen.Trim() : clientWarehouse?.Trim(); |
| | | 437 | | |
| | | 438 | | /// <summary>Номер по умолчанию без записи в справочнике означает «без ГТД»: пустая ссылка, а не отказ.</summary> |
| | | 439 | | private async Task<Guid?> ResolveGtdGuidAsync(string gtd) |
| | | 440 | | { |
| | 0 | 441 | | var key = await _referenceService.GetGtdGuidByNumberAsync(gtd); |
| | 0 | 442 | | return key == null && OneCODataConstants.IsDefaultGtd(gtd) ? Guid.Empty : key; |
| | 0 | 443 | | } |
| | | 444 | | |
| | | 445 | | private static string FormatMissingItem((string Article, string? ProductName, decimal Qty) item) |
| | 0 | 446 | | => string.IsNullOrWhiteSpace(item.ProductName) |
| | 0 | 447 | | ? $"{item.Article} ×{item.Qty}" |
| | 0 | 448 | | : $"{item.ProductName} [{item.Article}] ×{item.Qty}"; |
| | | 449 | | |
| | 0 | 450 | | public OneCReceiptManager SetClient(string user, string password) => this; |
| | | 451 | | |
| | 0 | 452 | | public Task<bool> GetTestRequest(string clientId, string apiKey) => Task.FromResult(true); |
| | | 453 | | |
| | | 454 | | private static string? GetZasylValue(Order? order) |
| | 0 | 455 | | => order?.OrderExtensions? |
| | 0 | 456 | | .FirstOrDefault(x => string.Equals(x.Key, ZasylKey, StringComparison.OrdinalIgnoreCase)) |
| | 0 | 457 | | ?.Value?.Trim(); |
| | | 458 | | |
| | | 459 | | private static string? GetEffectiveWarehouseName(Order? order) |
| | | 460 | | { |
| | 0 | 461 | | var zasyl = GetZasylValue(order); |
| | 0 | 462 | | return !string.IsNullOrWhiteSpace(zasyl) ? zasyl : order?.ShipmentWarehouse?.Name?.Trim(); |
| | | 463 | | } |
| | | 464 | | |
| | | 465 | | private static string BuildTransactionTitle(TransactionType transactionType, string? userName) |
| | | 466 | | { |
| | 0 | 467 | | var n = userName?.Trim(); |
| | 0 | 468 | | var userPart = string.IsNullOrWhiteSpace(n) || |
| | 0 | 469 | | n.Equals("system-auto", StringComparison.OrdinalIgnoreCase) || |
| | 0 | 470 | | n.Equals("system", StringComparison.OrdinalIgnoreCase) |
| | 0 | 471 | | ? "Система" |
| | 0 | 472 | | : n; |
| | 0 | 473 | | return $"{transactionType.GetDisplayName()} (пользователь: {userPart})"; |
| | | 474 | | } |
| | | 475 | | } |