| | | 1 | | using Services.SystemMonitoringServices; |
| | | 2 | | using Microsoft.Extensions.Logging; |
| | | 3 | | using Newtonsoft.Json.Linq; |
| | | 4 | | using OzonDomains; |
| | | 5 | | using OzonDomains.Models; |
| | | 6 | | using Services.ApiServices._1CApi.Models; |
| | | 7 | | using Services.ApiServices._1CApi.Nomenclature; |
| | | 8 | | using Services.OneCServices; |
| | | 9 | | using Services.ApiServices._1CApi.OData; |
| | | 10 | | using Services.ApiServices._1CApi.OData.Models; |
| | | 11 | | using Services.BackgroundJobsServices; |
| | | 12 | | using Services.DataServices; |
| | | 13 | | |
| | | 14 | | namespace Services.ApiServices._1CApi; |
| | | 15 | | |
| | | 16 | | public class OneCTransferManager : IApiDataManager<OneCTransferManager> |
| | | 17 | | { |
| | | 18 | | private readonly IOneCODataReferenceService _referenceService; |
| | | 19 | | private readonly IOneCODataClient _odataClient; |
| | | 20 | | private readonly IOneCNomenclatureService _nomenclatureService; |
| | | 21 | | private readonly WarehouseMappingDataServices _warehouseMappingDataServices; |
| | | 22 | | private readonly OrdersDataServices _orderServices; |
| | | 23 | | private readonly ISystemMonitoringSignalWriter? _signals; |
| | | 24 | | private readonly IOneCPostingFailureReporter? _failureReporter; |
| | | 25 | | private readonly ILogger<OneCTransferManager> _logger; |
| | | 26 | | private const string ZasylKey = "Засыл"; |
| | | 27 | | private const string TransferEndpoint = "Document_ПеремещениеЗапасов"; |
| | | 28 | | // Реквизит «Комментарий» документа 1С ограничен 1000 символами. |
| | | 29 | | private const int OneCCommentMaxLength = 1000; |
| | | 30 | | |
| | 0 | 31 | | public OneCTransferManager( |
| | 0 | 32 | | IOneCODataReferenceService referenceService, |
| | 0 | 33 | | IOneCODataClient odataClient, |
| | 0 | 34 | | IOneCNomenclatureService nomenclatureService, |
| | 0 | 35 | | WarehouseMappingDataServices warehouseMappingDataServices, |
| | 0 | 36 | | OrdersDataServices orderServices, |
| | 0 | 37 | | ILogger<OneCTransferManager> logger, |
| | 0 | 38 | | ISystemMonitoringSignalWriter? signals = null, |
| | 0 | 39 | | IOneCPostingFailureReporter? failureReporter = null) |
| | | 40 | | { |
| | 0 | 41 | | _signals = signals; |
| | 0 | 42 | | _failureReporter = failureReporter; |
| | 0 | 43 | | _referenceService = referenceService; |
| | 0 | 44 | | _odataClient = odataClient; |
| | 0 | 45 | | _nomenclatureService = nomenclatureService; |
| | 0 | 46 | | _warehouseMappingDataServices = warehouseMappingDataServices; |
| | 0 | 47 | | _orderServices = orderServices; |
| | 0 | 48 | | _logger = logger; |
| | 0 | 49 | | } |
| | | 50 | | |
| | 0 | 51 | | public OneCTransferManager SetClient(string user, string password) => this; |
| | | 52 | | |
| | | 53 | | // ─── Публичные методы (аналог старых) ───────────────────────────────────── |
| | | 54 | | |
| | | 55 | | public async Task<List<OneCResponse>> TransferStockByWarehouses( |
| | | 56 | | List<Order> allOrders, |
| | | 57 | | TransactionType transactionType, |
| | | 58 | | Dictionary<int, string>? orderSupplierMap = null, |
| | | 59 | | DateTime? documentDate = null, |
| | | 60 | | string? userName = null, |
| | | 61 | | string? orgInnOverride = null, |
| | | 62 | | bool createAsDraft = false, |
| | | 63 | | string? draftReason = null) |
| | | 64 | | { |
| | 0 | 65 | | if (allOrders == null || !allOrders.Any()) |
| | 0 | 66 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 67 | | |
| | 0 | 68 | | var filteredZasylMap = orderSupplierMap? |
| | | 69 | | .Where(m => m.Value != null) |
| | | 70 | | .ToDictionary(m => m.Key, m => m.Value); |
| | | 71 | | |
| | 0 | 72 | | var warehouseMappings = await _warehouseMappingDataServices.GetWarehouseMappings(); |
| | | 73 | | |
| | 0 | 74 | | var ordersWithWarehouse = allOrders |
| | 0 | 75 | | .Select(o => new |
| | 0 | 76 | | { |
| | 0 | 77 | | Ord = o, |
| | 0 | 78 | | Warehouse = ResolveWarehouseFor1C(o, filteredZasylMap, warehouseMappings) |
| | 0 | 79 | | }) |
| | 0 | 80 | | .ToList(); |
| | | 81 | | |
| | 0 | 82 | | var missing = ordersWithWarehouse |
| | | 83 | | .Where(x => string.IsNullOrWhiteSpace(x.Warehouse)) |
| | | 84 | | .Select(x => x.Ord.ShipmentNumber) |
| | 0 | 85 | | .ToList(); |
| | 0 | 86 | | if (missing.Any()) |
| | 0 | 87 | | throw new ArgumentException($"Не заполнен склад у заказов: {string.Join(", ", missing)}"); |
| | | 88 | | |
| | 0 | 89 | | var allResults = new List<OneCResponse>(); |
| | | 90 | | foreach (var warehouseGroup in ordersWithWarehouse.GroupBy(x => x.Warehouse!)) |
| | | 91 | | { |
| | | 92 | | try |
| | | 93 | | { |
| | 0 | 94 | | var results = await TransferStock( |
| | | 95 | | warehouseGroup.Select(x => x.Ord).ToList(), |
| | 0 | 96 | | transactionType, |
| | 0 | 97 | | warehouseGroup.Key, |
| | 0 | 98 | | documentDate, |
| | 0 | 99 | | userName, |
| | 0 | 100 | | filteredZasylMap, |
| | 0 | 101 | | orgInnOverride, createAsDraft, draftReason); |
| | 0 | 102 | | allResults.AddRange(results); |
| | 0 | 103 | | } |
| | 0 | 104 | | catch (Exception ex) |
| | | 105 | | { |
| | 0 | 106 | | allResults.Add(new OneCResponse |
| | 0 | 107 | | { |
| | 0 | 108 | | Success = false, |
| | 0 | 109 | | Message = $"Ошибка при обработке склада '{warehouseGroup.Key}': {ex.Message}" |
| | 0 | 110 | | }); |
| | 0 | 111 | | } |
| | 0 | 112 | | } |
| | | 113 | | |
| | 0 | 114 | | if (!allResults.Any()) |
| | 0 | 115 | | throw new ArgumentException("Не найдено заказов для обработки."); |
| | 0 | 116 | | return allResults; |
| | 0 | 117 | | } |
| | | 118 | | |
| | | 119 | | public async Task<List<OneCResponse>> TransferStock( |
| | | 120 | | List<Order> ordersToTransfer, |
| | | 121 | | TransactionType transactionType, |
| | | 122 | | string? zasyl = null, |
| | | 123 | | DateTime? documentDate = null, |
| | | 124 | | string? userName = null, |
| | | 125 | | Dictionary<int, string>? orderSupplierMap = null, |
| | | 126 | | string? orgInnOverride = null, |
| | | 127 | | bool createAsDraft = false, |
| | | 128 | | string? draftReason = null) |
| | | 129 | | { |
| | 0 | 130 | | if (ordersToTransfer == null || !ordersToTransfer.Any()) |
| | 0 | 131 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 132 | | |
| | | 133 | | string warehouseSenderName; |
| | 0 | 134 | | if (transactionType == TransactionType.AcceptedToWarehouse) |
| | | 135 | | { |
| | 0 | 136 | | warehouseSenderName = "NON"; |
| | | 137 | | } |
| | 0 | 138 | | else if (string.IsNullOrEmpty(zasyl)) |
| | | 139 | | { |
| | 0 | 140 | | var distinct = ordersToTransfer |
| | 0 | 141 | | .Select(o => GetEffectiveWarehouseName(o, orderSupplierMap)) |
| | | 142 | | .Where(x => !string.IsNullOrWhiteSpace(x)) |
| | 0 | 143 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 144 | | .ToList(); |
| | | 145 | | |
| | 0 | 146 | | if (distinct.Count > 1) |
| | 0 | 147 | | throw new ArgumentException($"Заказы имеют различные склады: {string.Join(", ", distinct)}"); |
| | 0 | 148 | | if (distinct.Count == 0) |
| | 0 | 149 | | throw new ArgumentException("Не указан склад для заказов."); |
| | 0 | 150 | | warehouseSenderName = distinct[0]!; |
| | | 151 | | } |
| | | 152 | | else |
| | | 153 | | { |
| | 0 | 154 | | warehouseSenderName = zasyl; |
| | | 155 | | } |
| | | 156 | | |
| | 0 | 157 | | var ordersByClient = ordersToTransfer |
| | | 158 | | .Where(o => o.OzonClient != null && o.OzonClientId.HasValue) |
| | | 159 | | .GroupBy(o => o.OzonClientId!.Value) |
| | | 160 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 161 | | |
| | 0 | 162 | | if (!ordersByClient.Any()) |
| | 0 | 163 | | throw new ArgumentException("Не найдено заказов с валидными данными клиента Ozon."); |
| | | 164 | | |
| | 0 | 165 | | var results = new List<OneCResponse>(); |
| | | 166 | | |
| | 0 | 167 | | foreach (var (_, orders) in ordersByClient) |
| | | 168 | | { |
| | 0 | 169 | | var client = orders.First().OzonClient!; |
| | 0 | 170 | | if (string.IsNullOrEmpty(client.INNCode) || string.IsNullOrEmpty(client.WarehouseName)) |
| | 0 | 171 | | throw new ArgumentException($"Клиент '{client.Name}' не имеет обязательных данных (ИНН или склад)."); |
| | | 172 | | |
| | 0 | 173 | | var comment = BuildComment(transactionType, userName, client.Name, |
| | | 174 | | orders.Select(o => o.ShipmentNumber)); |
| | | 175 | | |
| | 0 | 176 | | var result = await TransferByClientAsync( |
| | 0 | 177 | | client, orders, warehouseSenderName, client.WarehouseName, |
| | 0 | 178 | | transactionType, documentDate, comment, orgInnOverride: orgInnOverride, |
| | 0 | 179 | | createAsDraft: createAsDraft, draftReason: draftReason); |
| | 0 | 180 | | results.Add(result); |
| | | 181 | | } |
| | | 182 | | |
| | 0 | 183 | | return results; |
| | 0 | 184 | | } |
| | | 185 | | |
| | | 186 | | public async Task<List<OneCResponse>> TransferStockByWarehousesWithReversedWarehouses( |
| | | 187 | | List<Order> allOrders, |
| | | 188 | | TransactionType transactionType, |
| | | 189 | | Dictionary<int, string>? orderSupplierMap = null, |
| | | 190 | | DateTime? documentDate = null, |
| | | 191 | | string? userName = null, |
| | | 192 | | string? orgInnOverride = null, |
| | | 193 | | bool createAsDraft = false, |
| | | 194 | | string? draftReason = null) |
| | | 195 | | { |
| | 0 | 196 | | if (allOrders == null || !allOrders.Any()) |
| | 0 | 197 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 198 | | |
| | 0 | 199 | | var filteredZasylMap = orderSupplierMap? |
| | | 200 | | .Where(m => m.Value != null) |
| | | 201 | | .ToDictionary(m => m.Key, m => m.Value); |
| | | 202 | | |
| | 0 | 203 | | var warehouseMappings = await _warehouseMappingDataServices.GetWarehouseMappings(); |
| | | 204 | | |
| | 0 | 205 | | var ordersWithWarehouse = allOrders |
| | 0 | 206 | | .Select(o => new |
| | 0 | 207 | | { |
| | 0 | 208 | | Order = o, |
| | 0 | 209 | | Warehouse = ResolveWarehouseFor1C(o, filteredZasylMap, warehouseMappings) |
| | 0 | 210 | | }) |
| | 0 | 211 | | .ToList(); |
| | | 212 | | |
| | 0 | 213 | | var missing = ordersWithWarehouse |
| | | 214 | | .Where(x => string.IsNullOrWhiteSpace(x.Warehouse)) |
| | | 215 | | .Select(x => x.Order.ShipmentNumber) |
| | 0 | 216 | | .ToList(); |
| | 0 | 217 | | if (missing.Any()) |
| | 0 | 218 | | throw new ArgumentException($"Не заполнен склад у заказов: {string.Join(", ", missing)}"); |
| | | 219 | | |
| | 0 | 220 | | var allResults = new List<OneCResponse>(); |
| | | 221 | | foreach (var warehouseGroup in ordersWithWarehouse.GroupBy(x => x.Warehouse!)) |
| | | 222 | | { |
| | | 223 | | try |
| | | 224 | | { |
| | 0 | 225 | | var results = await TransferStockWithReversedWarehouses( |
| | | 226 | | warehouseGroup.Select(x => x.Order).ToList(), |
| | 0 | 227 | | transactionType, |
| | 0 | 228 | | warehouseGroup.Key, |
| | 0 | 229 | | documentDate, |
| | 0 | 230 | | userName, |
| | 0 | 231 | | filteredZasylMap, |
| | 0 | 232 | | warehouseMappings, |
| | 0 | 233 | | orgInnOverride, createAsDraft, draftReason); |
| | 0 | 234 | | allResults.AddRange(results); |
| | 0 | 235 | | } |
| | 0 | 236 | | catch (Exception ex) |
| | | 237 | | { |
| | 0 | 238 | | allResults.Add(new OneCResponse |
| | 0 | 239 | | { |
| | 0 | 240 | | Success = false, |
| | 0 | 241 | | Message = $"Ошибка при обработке склада '{warehouseGroup.Key}': {ex.Message}" |
| | 0 | 242 | | }); |
| | 0 | 243 | | } |
| | 0 | 244 | | } |
| | | 245 | | |
| | 0 | 246 | | if (!allResults.Any()) |
| | 0 | 247 | | throw new ArgumentException("Не найдено заказов для обработки."); |
| | 0 | 248 | | return allResults; |
| | 0 | 249 | | } |
| | | 250 | | |
| | | 251 | | public async Task<List<OneCResponse>> TransferStockWithCustomWarehouses( |
| | | 252 | | List<Order> ordersToTransfer, |
| | | 253 | | string warehouseSender, |
| | | 254 | | string warehouseRecipient, |
| | | 255 | | TransactionType transactionType, |
| | | 256 | | DateTime? documentDate = null, |
| | | 257 | | string? userName = null, |
| | | 258 | | string? orgInnOverride = null, |
| | | 259 | | bool createAsDraft = false, |
| | | 260 | | string? draftReason = null) |
| | | 261 | | { |
| | 0 | 262 | | if (ordersToTransfer == null || !ordersToTransfer.Any()) |
| | 0 | 263 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | 0 | 264 | | if (string.IsNullOrEmpty(warehouseSender)) |
| | 0 | 265 | | throw new ArgumentException("Не указан склад отправителя."); |
| | 0 | 266 | | if (string.IsNullOrEmpty(warehouseRecipient)) |
| | 0 | 267 | | throw new ArgumentException("Не указан склад получателя."); |
| | 0 | 268 | | if (warehouseSender == warehouseRecipient) |
| | 0 | 269 | | throw new ArgumentException("Склад отправителя и получателя не могут совпадать."); |
| | | 270 | | |
| | 0 | 271 | | var ordersByClient = ordersToTransfer |
| | | 272 | | .Where(o => o.OzonClient != null && o.OzonClientId.HasValue) |
| | | 273 | | .GroupBy(o => o.OzonClientId!.Value) |
| | | 274 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 275 | | |
| | 0 | 276 | | if (!ordersByClient.Any()) |
| | 0 | 277 | | throw new ArgumentException("Не найдено заказов с валидными данными клиента Ozon."); |
| | | 278 | | |
| | 0 | 279 | | var results = new List<OneCResponse>(); |
| | 0 | 280 | | foreach (var (_, orders) in ordersByClient) |
| | | 281 | | { |
| | 0 | 282 | | var client = orders.First().OzonClient!; |
| | 0 | 283 | | if (string.IsNullOrEmpty(client.INNCode)) |
| | 0 | 284 | | throw new ArgumentException($"Клиент '{client.Name}' не имеет ИНН."); |
| | | 285 | | |
| | 0 | 286 | | var comment = BuildComment(transactionType, userName, client.Name, |
| | | 287 | | orders.Select(o => o.ShipmentNumber), |
| | 0 | 288 | | $"Со склада '{warehouseSender}' на склад '{warehouseRecipient}'."); |
| | | 289 | | |
| | 0 | 290 | | var result = await TransferByClientAsync( |
| | 0 | 291 | | client, orders, warehouseSender, warehouseRecipient, |
| | 0 | 292 | | transactionType, documentDate, comment, orgInnOverride: orgInnOverride, |
| | 0 | 293 | | createAsDraft: createAsDraft, draftReason: draftReason); |
| | 0 | 294 | | results.Add(result); |
| | | 295 | | } |
| | | 296 | | |
| | 0 | 297 | | return results; |
| | 0 | 298 | | } |
| | | 299 | | |
| | | 300 | | public async Task<bool> WarehouseExistsAsync(string warehouseName) => |
| | 0 | 301 | | !string.IsNullOrWhiteSpace(warehouseName) && |
| | 0 | 302 | | (await _referenceService.GetWarehouseGuidByNameAsync(warehouseName)).HasValue; |
| | | 303 | | |
| | | 304 | | public async Task<List<OneCResponse>> TransferStockToTransitWarehouses( |
| | | 305 | | List<Order> allOrders, |
| | | 306 | | IReadOnlyDictionary<int, decimal>? stockQtyOverrides = null, |
| | | 307 | | DateTime? documentDate = null, |
| | | 308 | | string? userName = null, |
| | | 309 | | string? orgInnOverride = null, |
| | | 310 | | bool createAsDraft = false, |
| | | 311 | | string? draftReason = null) |
| | | 312 | | { |
| | 0 | 313 | | if (allOrders == null || !allOrders.Any()) |
| | 0 | 314 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 315 | | |
| | 0 | 316 | | var warehouseMappings = await _warehouseMappingDataServices.GetWarehouseMappings(); |
| | | 317 | | |
| | 0 | 318 | | var ordersWithTransit = allOrders |
| | 0 | 319 | | .Select(o => new |
| | 0 | 320 | | { |
| | 0 | 321 | | Order = o, |
| | 0 | 322 | | Resolution = ShippedToCommissionerWarehouseResolver.ResolveTransitWarehouse(o, warehouseMappings) |
| | 0 | 323 | | }) |
| | 0 | 324 | | .ToList(); |
| | | 325 | | |
| | 0 | 326 | | var allResults = new List<OneCResponse>(); |
| | 0 | 327 | | foreach (var transitGroup in ordersWithTransit.GroupBy( |
| | | 328 | | x => (Sender: x.Resolution.SenderWarehouse ?? "", Transit: x.Resolution.TransitWarehouse ?? ""))) |
| | | 329 | | { |
| | 0 | 330 | | var senderName = transitGroup.Key.Sender; |
| | 0 | 331 | | var transitName = transitGroup.Key.Transit; |
| | 0 | 332 | | if (string.IsNullOrWhiteSpace(senderName)) |
| | | 333 | | { |
| | 0 | 334 | | allResults.Add(new OneCResponse |
| | 0 | 335 | | { |
| | 0 | 336 | | Success = false, |
| | 0 | 337 | | Message = "Не удалось определить склад отправителя для части заказов." |
| | 0 | 338 | | }); |
| | 0 | 339 | | continue; |
| | | 340 | | } |
| | 0 | 341 | | if (string.IsNullOrWhiteSpace(transitName)) |
| | | 342 | | { |
| | 0 | 343 | | allResults.Add(new OneCResponse |
| | 0 | 344 | | { |
| | 0 | 345 | | Success = false, |
| | 0 | 346 | | Message = $"Для склада '{senderName}' не заполнен транзитный склад 1С в WarehouseMapping." |
| | 0 | 347 | | }); |
| | 0 | 348 | | continue; |
| | | 349 | | } |
| | | 350 | | |
| | | 351 | | var ordersInGroup = transitGroup.Select(x => x.Order).ToList(); |
| | | 352 | | |
| | 0 | 353 | | var ordersByClient = ordersInGroup |
| | | 354 | | .Where(o => o.OzonClient != null && o.OzonClientId.HasValue) |
| | | 355 | | .GroupBy(o => o.OzonClientId!.Value) |
| | | 356 | | .ToDictionary(g => g.Key, g => g.ToList()); |
| | | 357 | | |
| | 0 | 358 | | if (!ordersByClient.Any()) |
| | | 359 | | { |
| | 0 | 360 | | allResults.Add(new OneCResponse |
| | 0 | 361 | | { |
| | 0 | 362 | | Success = false, |
| | 0 | 363 | | Message = $"Нет заказов с клиентом Ozon для склада '{senderName}'." |
| | 0 | 364 | | }); |
| | 0 | 365 | | continue; |
| | | 366 | | } |
| | | 367 | | |
| | 0 | 368 | | foreach (var (_, clientOrders) in ordersByClient) |
| | | 369 | | { |
| | 0 | 370 | | var client = clientOrders.First().OzonClient!; |
| | 0 | 371 | | if (string.IsNullOrEmpty(client.INNCode)) |
| | | 372 | | { |
| | 0 | 373 | | allResults.Add(new OneCResponse |
| | 0 | 374 | | { |
| | 0 | 375 | | Success = false, |
| | 0 | 376 | | Message = $"Клиент '{client.Name}' не имеет ИНН." |
| | 0 | 377 | | }); |
| | 0 | 378 | | continue; |
| | | 379 | | } |
| | | 380 | | |
| | 0 | 381 | | var comment = BuildComment( |
| | 0 | 382 | | TransactionType.LostByCommissioner, userName, client.Name, |
| | | 383 | | clientOrders.Select(o => o.ShipmentNumber), |
| | 0 | 384 | | $"Со склада '{senderName}' на склад '{transitName}'."); |
| | | 385 | | try |
| | | 386 | | { |
| | 0 | 387 | | var result = await TransferByClientAsync( |
| | 0 | 388 | | client, clientOrders, senderName, transitName, |
| | 0 | 389 | | TransactionType.LostByCommissioner, documentDate, comment, |
| | 0 | 390 | | stockQtyOverrides, orgInnOverride: orgInnOverride, |
| | 0 | 391 | | createAsDraft: createAsDraft, draftReason: draftReason); |
| | 0 | 392 | | allResults.Add(result); |
| | 0 | 393 | | } |
| | 0 | 394 | | catch (Exception ex) |
| | | 395 | | { |
| | 0 | 396 | | allResults.Add(new OneCResponse |
| | 0 | 397 | | { |
| | 0 | 398 | | Success = false, |
| | 0 | 399 | | Message = $"Ошибка для '{senderName}' → '{transitName}': {ex.Message}" |
| | 0 | 400 | | }); |
| | 0 | 401 | | } |
| | | 402 | | } |
| | 0 | 403 | | } |
| | | 404 | | |
| | 0 | 405 | | if (!allResults.Any()) |
| | 0 | 406 | | throw new ArgumentException("Не найдено заказов для обработки."); |
| | 0 | 407 | | return allResults; |
| | 0 | 408 | | } |
| | | 409 | | |
| | | 410 | | public async Task<bool> TestConnectionAsync() |
| | | 411 | | { |
| | | 412 | | try |
| | | 413 | | { |
| | 0 | 414 | | await _referenceService.GetWarehousesAsync(); |
| | 0 | 415 | | return true; |
| | | 416 | | } |
| | 0 | 417 | | catch |
| | | 418 | | { |
| | 0 | 419 | | return false; |
| | | 420 | | } |
| | 0 | 421 | | } |
| | | 422 | | |
| | 0 | 423 | | public Task<bool> GetTestRequest(string user, string password) => TestConnectionAsync(); |
| | | 424 | | |
| | | 425 | | // ─── Внутренняя логика ───────────────────────────────────────────────────── |
| | | 426 | | |
| | | 427 | | private async Task<List<OneCResponse>> TransferStockWithReversedWarehouses( |
| | | 428 | | List<Order> ordersToTransfer, |
| | | 429 | | TransactionType transactionType, |
| | | 430 | | string? zasyl, |
| | | 431 | | DateTime? documentDate, |
| | | 432 | | string? userName, |
| | | 433 | | Dictionary<int, string>? orderSupplierMap, |
| | | 434 | | List<WarehouseMapping>? warehouseMappings, |
| | | 435 | | string? orgInnOverride = null, |
| | | 436 | | bool createAsDraft = false, |
| | | 437 | | string? draftReason = null) |
| | | 438 | | { |
| | 0 | 439 | | if (ordersToTransfer == null || !ordersToTransfer.Any()) |
| | 0 | 440 | | throw new ArgumentException("Список заказов не может быть пустым."); |
| | | 441 | | |
| | | 442 | | string warehouseName; |
| | 0 | 443 | | if (string.IsNullOrEmpty(zasyl)) |
| | | 444 | | { |
| | 0 | 445 | | var distinct = ordersToTransfer |
| | 0 | 446 | | .Select(o => ResolveWarehouseFor1C(o, orderSupplierMap, warehouseMappings)) |
| | | 447 | | .Where(x => !string.IsNullOrWhiteSpace(x)) |
| | 0 | 448 | | .Distinct(StringComparer.OrdinalIgnoreCase) |
| | 0 | 449 | | .ToList(); |
| | | 450 | | |
| | 0 | 451 | | if (distinct.Count > 1) |
| | 0 | 452 | | throw new ArgumentException($"Заказы имеют различные склады: {string.Join(", ", distinct)}"); |
| | 0 | 453 | | if (distinct.Count == 0) |
| | 0 | 454 | | throw new ArgumentException("Не указан склад для заказов."); |
| | 0 | 455 | | warehouseName = distinct[0]!; |
| | | 456 | | } |
| | | 457 | | else |
| | | 458 | | { |
| | 0 | 459 | | warehouseName = zasyl; |
| | | 460 | | } |
| | | 461 | | |
| | | 462 | | var client = ordersToTransfer.Select(o => o.OzonClient).FirstOrDefault(o => o != null) |
| | 0 | 463 | | ?? throw new ArgumentException("Не найдено заказов с валидными данными клиента Ozon."); |
| | | 464 | | |
| | 0 | 465 | | if (string.IsNullOrEmpty(client.INNCode) || string.IsNullOrEmpty(client.WarehouseName)) |
| | 0 | 466 | | throw new ArgumentException($"Клиент '{client.Name}' не имеет обязательных данных."); |
| | | 467 | | |
| | 0 | 468 | | var swapWarehouses = transactionType == TransactionType.ShippedToCommissioner; |
| | 0 | 469 | | var senderName = swapWarehouses ? warehouseName : client.WarehouseName; |
| | 0 | 470 | | var recipientName = swapWarehouses ? client.WarehouseName : warehouseName; |
| | | 471 | | |
| | 0 | 472 | | var comment = BuildComment(transactionType, userName, client.Name, |
| | | 473 | | ordersToTransfer.Select(o => o.ShipmentNumber)); |
| | | 474 | | |
| | 0 | 475 | | var result = await TransferByClientAsync( |
| | 0 | 476 | | client, ordersToTransfer, senderName, recipientName, |
| | 0 | 477 | | transactionType, documentDate, comment, orgInnOverride: orgInnOverride, |
| | 0 | 478 | | createAsDraft: createAsDraft, draftReason: draftReason); |
| | 0 | 479 | | return new List<OneCResponse> { result }; |
| | 0 | 480 | | } |
| | | 481 | | |
| | | 482 | | private async Task<OneCResponse> TransferByClientAsync( |
| | | 483 | | OzonClient client, |
| | | 484 | | List<Order> orders, |
| | | 485 | | string warehouseSenderName, |
| | | 486 | | string warehouseRecipientName, |
| | | 487 | | TransactionType transactionType, |
| | | 488 | | DateTime? documentDate, |
| | | 489 | | string comment, |
| | | 490 | | IReadOnlyDictionary<int, decimal>? stockQtyOverrides = null, |
| | | 491 | | string? orgInnOverride = null, |
| | | 492 | | bool createAsDraft = false, |
| | | 493 | | string? draftReason = null) |
| | | 494 | | { |
| | 0 | 495 | | var response = await TransferByClientCoreAsync(client, orders, warehouseSenderName, warehouseRecipientName, tran |
| | 0 | 496 | | _failureReporter?.Report(response, $"{transactionType.GetDisplayName()}: перемещение {warehouseSenderName} → {wa |
| | 0 | 497 | | return response; |
| | 0 | 498 | | } |
| | | 499 | | |
| | | 500 | | private async Task<OneCResponse> TransferByClientCoreAsync( |
| | | 501 | | OzonClient client, |
| | | 502 | | List<Order> orders, |
| | | 503 | | string warehouseSenderName, |
| | | 504 | | string warehouseRecipientName, |
| | | 505 | | TransactionType transactionType, |
| | | 506 | | DateTime? documentDate, |
| | | 507 | | string comment, |
| | | 508 | | IReadOnlyDictionary<int, decimal>? stockQtyOverrides = null, |
| | | 509 | | string? orgInnOverride = null, |
| | | 510 | | bool createAsDraft = false, |
| | | 511 | | string? draftReason = null) |
| | | 512 | | { |
| | | 513 | | const string operationLabel = "создании перемещения"; |
| | | 514 | | |
| | | 515 | | try |
| | | 516 | | { |
| | | 517 | | // Override → явный выбор пользователя; иначе всегда "0000000000" (Interparts) |
| | 0 | 518 | | var effectiveOrgInn = !string.IsNullOrWhiteSpace(orgInnOverride) ? orgInnOverride.Trim() : "0000000000"; |
| | 0 | 519 | | var orgGuid = await _referenceService.GetOrganizationGuidByInnAsync(effectiveOrgInn) |
| | 0 | 520 | | ?? throw new InvalidOperationException($"Организация с ИНН '{effectiveOrgInn}' не найдена в 1С."); |
| | | 521 | | |
| | | 522 | | // Резолвинг складов |
| | 0 | 523 | | var senderGuid = await _referenceService.GetWarehouseGuidByNameAsync(warehouseSenderName) |
| | 0 | 524 | | ?? throw new InvalidOperationException($"Склад-отправитель '{warehouseSenderName}' не найден в 1С."); |
| | | 525 | | |
| | 0 | 526 | | var recipientGuid = await _referenceService.GetWarehouseGuidByNameAsync(warehouseRecipientName) |
| | 0 | 527 | | ?? throw new InvalidOperationException($"Склад-получатель '{warehouseRecipientName}' не найден в 1С."); |
| | | 528 | | |
| | | 529 | | // Для отгрузки реализатору и утраты реализатором карточки номенклатуры запрещено |
| | | 530 | | // создавать автоматически: документ оставляем черновиком, а отсутствующие позиции |
| | | 531 | | // перечисляем в комментарии. Это правило действует и для фоновых TransactionJobs, |
| | | 532 | | // поскольку все они проходят через этот общий метод. |
| | 0 | 533 | | var allowNomenclatureCreation = AllowsNomenclatureCreation(transactionType); |
| | 0 | 534 | | var validOrders = orders |
| | | 535 | | .Where(o => !string.IsNullOrEmpty(o.Article) && o.Quantity.HasValue && o.Quantity.Value > 0) |
| | 0 | 536 | | .ToList(); |
| | | 537 | | // (article, productName, qty) для позиций без номенклатуры в 1С |
| | 0 | 538 | | var missingItems = new List<(string Article, string? ProductName, decimal Qty)>(); |
| | 0 | 539 | | var createdNomenclature = new List<string>(); |
| | | 540 | | |
| | 0 | 541 | | var resolutions = await _nomenclatureService.ResolveManyAsync( |
| | 0 | 542 | | validOrders, |
| | 0 | 543 | | allowNomenclatureCreation ? NomenclatureMode.FindOrCreate : NomenclatureMode.FindOnly, |
| | 0 | 544 | | origin: new OneCNomenclatureOrigin(transactionType)); |
| | 0 | 545 | | var missingReasons = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); |
| | 0 | 546 | | var nomenclatureNotes = new List<string>(); |
| | | 547 | | |
| | 0 | 548 | | var lines = new List<ODataTransferLine>(); |
| | | 549 | | // Артикул и количество каждой строки — для сводки в UI: количество может отличаться |
| | | 550 | | // от Quantity заказа (stockQtyOverrides), и показывать надо то, что ушло в 1С. |
| | 0 | 551 | | var documentLines = new List<OneCDocumentLine>(); |
| | 0 | 552 | | var lineNum = 1; |
| | 0 | 553 | | for (var i = 0; i < validOrders.Count; i++) |
| | | 554 | | { |
| | 0 | 555 | | var order = validOrders[i]; |
| | 0 | 556 | | var resolution = resolutions[i]; |
| | 0 | 557 | | var nomenclatureKey = resolution.RefKey; |
| | 0 | 558 | | if (resolution.Created) |
| | 0 | 559 | | createdNomenclature.Add(resolution.DisplayName); |
| | 0 | 560 | | if (resolution.FoundByVariant && !string.IsNullOrWhiteSpace(resolution.Reason)) |
| | 0 | 561 | | nomenclatureNotes.Add($"{order.Article}: {resolution.Reason}"); |
| | 0 | 562 | | if (!nomenclatureKey.HasValue) |
| | | 563 | | { |
| | 0 | 564 | | var missingQty = stockQtyOverrides != null && |
| | 0 | 565 | | stockQtyOverrides.TryGetValue(order.Id, out var overriddenMissingQty) && |
| | 0 | 566 | | overriddenMissingQty > 0 |
| | 0 | 567 | | ? overriddenMissingQty |
| | 0 | 568 | | : (decimal)(order.TrueQuantity ?? order.Quantity!.Value); |
| | 0 | 569 | | var missingArticle = GetArticleForNomenclatureSearch(order); |
| | 0 | 570 | | missingItems.Add((missingArticle, order.ProductName, missingQty)); |
| | 0 | 571 | | NomenclatureResolution.NoteReason(missingReasons, missingArticle, resolution.Reason); |
| | 0 | 572 | | continue; |
| | | 573 | | } |
| | | 574 | | |
| | 0 | 575 | | var effectiveQty = stockQtyOverrides != null && |
| | 0 | 576 | | stockQtyOverrides.TryGetValue(order.Id, out var overrideQty) && |
| | 0 | 577 | | overrideQty > 0 |
| | 0 | 578 | | ? overrideQty |
| | 0 | 579 | | // validOrders уже отфильтрован по Quantity.HasValue выше. |
| | 0 | 580 | | : (decimal)(order.TrueQuantity ?? order.Quantity!.Value); |
| | | 581 | | |
| | 0 | 582 | | lines.Add(new ODataTransferLine |
| | 0 | 583 | | { |
| | 0 | 584 | | LineNumber = lineNum++, |
| | 0 | 585 | | NomenclatureKey = nomenclatureKey.Value, |
| | 0 | 586 | | WarehouseSenderKey = senderGuid, |
| | 0 | 587 | | Quantity = effectiveQty |
| | 0 | 588 | | }); |
| | 0 | 589 | | documentLines.Add(new OneCDocumentLine |
| | 0 | 590 | | { |
| | 0 | 591 | | Article = order.Article ?? GetArticleForNomenclatureSearch(order), |
| | 0 | 592 | | Quantity = effectiveQty |
| | 0 | 593 | | }); |
| | | 594 | | } |
| | | 595 | | |
| | 0 | 596 | | if (!lines.Any() && !missingItems.Any()) |
| | | 597 | | { |
| | 0 | 598 | | var msg = $"Для клиента '{client.Name}' не найдено товаров с валидными данными."; |
| | 0 | 599 | | _logger.LogWarning("[OData] {Msg}", msg); |
| | 0 | 600 | | return new OneCResponse { Success = false, Message = msg }; |
| | | 601 | | } |
| | | 602 | | |
| | 0 | 603 | | var fullComment = createAsDraft |
| | 0 | 604 | | ? BuildDraftComment(comment, draftReason ?? "недостаточно остатка в 1С. Проведите после оприходования то |
| | 0 | 605 | | : comment; |
| | 0 | 606 | | string? missingNomStr = null; |
| | 0 | 607 | | if (missingItems.Any()) |
| | | 608 | | { |
| | 0 | 609 | | missingNomStr = string.Join(", ", missingItems.Select(i => FormatMissingItem(i) + NomenclatureResolution |
| | 0 | 610 | | var allMissing = !lines.Any(); |
| | 0 | 611 | | var missingNomenclatureDraftReason = allMissing |
| | 0 | 612 | | ? $"⚠ Черновик (все позиции без номенклатуры 1С) — {missingNomStr}" |
| | 0 | 613 | | : $"⚠ Черновик — не найдена номенклатура: {missingNomStr}"; |
| | 0 | 614 | | fullComment = BuildDraftComment(fullComment, missingNomenclatureDraftReason); |
| | | 615 | | // Создание черновика при нехватке номенклатуры — штатный бизнес-сценарий: |
| | | 616 | | // документ сохраняется в 1С как черновик, а пользователю выводится всплывающее |
| | | 617 | | // уведомление (OneCResponse.Message / TempData["TransactionResult"]). |
| | | 618 | | // Уровень Information, чтобы не спамить в errors-*.log и не заводить issues. |
| | 0 | 619 | | await (_signals?.RecordAsync(OneCNomenclatureService.NomenclatureSignalSource, "failure", "missing", |
| | 0 | 620 | | $"Перемещение: не найдена номенклатура: {missingNomStr}") ?? Task.CompletedTask); |
| | 0 | 621 | | _logger.LogInformation("[OData] Создаём черновик перемещения{Suffix}: не найдена номенклатура для {Missi |
| | 0 | 622 | | allMissing ? " (все позиции)" : "", missingNomStr); |
| | | 623 | | } |
| | | 624 | | |
| | 0 | 625 | | var request = new ODataTransferRequest |
| | 0 | 626 | | { |
| | 0 | 627 | | Date = FormatODataDate(documentDate), |
| | 0 | 628 | | OrganizationKey = orgGuid, |
| | 0 | 629 | | WarehouseSenderKey = senderGuid, |
| | 0 | 630 | | WarehouseRecipientKey = recipientGuid, |
| | 0 | 631 | | Comment = fullComment, |
| | 0 | 632 | | Lines = lines |
| | 0 | 633 | | }; |
| | | 634 | | |
| | 0 | 635 | | var doc = await _odataClient.PostAsync<ODataTransferRequest, ODataDocumentResponse>( |
| | 0 | 636 | | TransferEndpoint, request); |
| | | 637 | | |
| | 0 | 638 | | var documentValidationError = await ValidateCreatedTransferDocumentAsync(doc.RefKey, lines); |
| | 0 | 639 | | if (documentValidationError != null) |
| | | 640 | | { |
| | | 641 | | // Success=true: документ в 1С реально создан (doc.RefKey существует) — если пометить как |
| | | 642 | | // Success=false, вызывающий код (BaseTransactionController и т.п.) отбросит TransactionId |
| | | 643 | | // как у несостоявшейся операции и при повторной попытке создаст ДУБЛИКАТ документа в 1С. |
| | | 644 | | // Как и при обычной ошибке проведения (см. ветку isPosted ниже), непроведённость сообщаем |
| | | 645 | | // через IsPosted=false/PostingError, а не через Success. |
| | 0 | 646 | | var msg = $"Перемещение {doc.Number ?? doc.RefKey.ToString()} создано, но не проведено: {documentValidat |
| | 0 | 647 | | _logger.LogError("[OData] {Message}. Документ {RefKey} оставлен черновиком.", msg, doc.RefKey); |
| | 0 | 648 | | return new OneCResponse |
| | 0 | 649 | | { |
| | 0 | 650 | | Success = true, |
| | 0 | 651 | | Message = msg, |
| | 0 | 652 | | TransactionId = doc.RefKey.ToString(), |
| | 0 | 653 | | DocumentNumber = doc.Number, |
| | 0 | 654 | | IsPosted = false, |
| | 0 | 655 | | PostingError = documentValidationError, |
| | 0 | 656 | | DocumentLines = documentLines |
| | 0 | 657 | | }; |
| | | 658 | | } |
| | | 659 | | |
| | 0 | 660 | | bool isPosted = false; |
| | 0 | 661 | | string? postingError = null; |
| | 0 | 662 | | string? errorDetail = null; |
| | 0 | 663 | | string? shortageReason = null; |
| | 0 | 664 | | string docNumber = doc.Number ?? ""; |
| | | 665 | | |
| | 0 | 666 | | if (missingItems.Any()) |
| | | 667 | | { |
| | 0 | 668 | | var fetched = await _odataClient.GetByGuidAsync<ODataDocumentResponse>(TransferEndpoint, doc.RefKey); |
| | 0 | 669 | | if (fetched != null && !string.IsNullOrWhiteSpace(fetched.Number)) |
| | 0 | 670 | | docNumber = fetched.Number; |
| | 0 | 671 | | _logger.LogInformation("[OData] Перемещение {Number} ({Guid}) — черновик, отсутствует номенклатура", doc |
| | | 672 | | } |
| | 0 | 673 | | else if (!createAsDraft) |
| | | 674 | | { |
| | | 675 | | try |
| | | 676 | | { |
| | 0 | 677 | | await _odataClient.PostDocumentAsync(TransferEndpoint, doc.RefKey); |
| | 0 | 678 | | isPosted = true; |
| | 0 | 679 | | var fetched = await _odataClient.GetByGuidAsync<ODataDocumentResponse>(TransferEndpoint, doc.RefKey) |
| | 0 | 680 | | if (fetched != null && !string.IsNullOrWhiteSpace(fetched.Number)) |
| | 0 | 681 | | docNumber = fetched.Number; |
| | 0 | 682 | | } |
| | | 683 | | // Отказ 1С провести документ — ожидаемый бизнес-исход (обычно не хватает |
| | | 684 | | // остатка): документ остаётся черновиком, а готовая причина уходит пользователю |
| | | 685 | | // в алерт транзакции. Это не сбой интеграции, поэтому Information: Warning и Error |
| | | 686 | | // попадают в errors-*.log и заводят автоматический issue на штатную ситуацию. |
| | 0 | 687 | | catch (OneCDocumentPostingException postingEx) |
| | | 688 | | { |
| | 0 | 689 | | postingError = postingEx.Message; |
| | 0 | 690 | | errorDetail = OneCResponseErrors.Describe(postingEx); |
| | 0 | 691 | | _logger.LogInformation("[OData] 1С не провела перемещения {Guid}: {Reason}", doc.RefKey, postingEx.D |
| | 0 | 692 | | if (OneCDocumentPostingMessage.IsUninformative(postingEx.Detail)) |
| | 0 | 693 | | shortageReason = await DiagnoseShortageAsync(warehouseSenderName, senderGuid, lines, documentLin |
| | 0 | 694 | | if (shortageReason != null) |
| | | 695 | | { |
| | 0 | 696 | | postingError = shortageReason; |
| | 0 | 697 | | _logger.LogInformation("[OData] Причина отказа перемещения {Guid} по остаткам: {Shortage}", doc. |
| | | 698 | | } |
| | | 699 | | } |
| | 0 | 700 | | catch (Exception patchEx) |
| | | 701 | | { |
| | 0 | 702 | | postingError = OneCODataErrorFormatter.Format(patchEx.Message); |
| | 0 | 703 | | errorDetail = OneCResponseErrors.Describe(patchEx); |
| | 0 | 704 | | _logger.LogError(patchEx, "[OData] Ошибка проведения перемещения {Guid}", doc.RefKey); |
| | 0 | 705 | | } |
| | | 706 | | |
| | | 707 | | // 1С в ответе на /Post при нехватке остатка возвращает только общую фразу |
| | | 708 | | // «Не удалось провести "..."!» без детализации причины. Если в этом же документе |
| | | 709 | | // только что создана номенклатура — она гарантированно имеет нулевой остаток на |
| | | 710 | | // складе-отправителе. Если ВСЕ строки документа — новая номенклатура, это точная |
| | | 711 | | // причина отказа; если только часть строк — это лишь вероятная причина (могло не |
| | | 712 | | // хватить остатка и по уже существующей позиции), формулировку смягчаем. |
| | 0 | 713 | | if (!isPosted && shortageReason == null && createdNomenclature.Any()) |
| | | 714 | | { |
| | 0 | 715 | | var namesJoined = string.Join(", ", createdNomenclature.Distinct(StringComparer.OrdinalIgnoreCase)); |
| | 0 | 716 | | var causePrefix = lines.Count == createdNomenclature.Count |
| | 0 | 717 | | ? "Не хватает остатка" |
| | 0 | 718 | | : "Вероятно, не хватает остатка"; |
| | 0 | 719 | | postingError = |
| | 0 | 720 | | $"{causePrefix} на складе «{warehouseSenderName}»: только что созданная номенклатура ({namesJoin |
| | | 721 | | } |
| | | 722 | | } |
| | | 723 | | |
| | | 724 | | string message; |
| | 0 | 725 | | if (missingItems.Any()) |
| | | 726 | | { |
| | 0 | 727 | | var allMissing = !lines.Any(); |
| | 0 | 728 | | message = allMissing |
| | 0 | 729 | | ? $"Перемещение {docNumber} создано как черновик — все позиции без номенклатуры 1С: {missingNomStr}" |
| | 0 | 730 | | : $"Перемещение {docNumber} создано как черновик — не найдена номенклатура: {missingNomStr}"; |
| | | 731 | | } |
| | | 732 | | else |
| | | 733 | | { |
| | 0 | 734 | | message = createAsDraft |
| | 0 | 735 | | ? $"Перемещение {docNumber} создано как черновик: {draftReason ?? "недостаточно остатка в 1С"}" |
| | 0 | 736 | | : isPosted |
| | 0 | 737 | | ? $"Перемещение {docNumber} создано и проведено" |
| | 0 | 738 | | : $"Перемещение {docNumber} создано, проведение не выполнено: {postingError}"; |
| | | 739 | | } |
| | | 740 | | |
| | 0 | 741 | | return new OneCResponse |
| | 0 | 742 | | { |
| | 0 | 743 | | Success = true, |
| | 0 | 744 | | Message = message, |
| | 0 | 745 | | TransactionId = doc.RefKey.ToString(), |
| | 0 | 746 | | DocumentNumber = string.IsNullOrWhiteSpace(docNumber) ? null : docNumber, |
| | 0 | 747 | | IsPosted = isPosted, |
| | 0 | 748 | | IsDraft = createAsDraft, |
| | 0 | 749 | | MissingNomenclature = missingNomStr, |
| | 0 | 750 | | CreatedNomenclature = string.Join(", ", createdNomenclature.Distinct(StringComparer.OrdinalIgnoreCase)), |
| | 0 | 751 | | PostingError = postingError, |
| | 0 | 752 | | ErrorDetail = errorDetail, |
| | 0 | 753 | | NomenclatureNotes = nomenclatureNotes.Count > 0 ? nomenclatureNotes : null, |
| | 0 | 754 | | DocumentLines = documentLines |
| | 0 | 755 | | }; |
| | | 756 | | } |
| | 0 | 757 | | catch (Exception ex) |
| | | 758 | | { |
| | 0 | 759 | | var msg = $"Ошибка при {operationLabel}: {ex.Message}"; |
| | 0 | 760 | | _logger.LogError(ex, "[OData] {Msg}", msg); |
| | 0 | 761 | | return new OneCResponse { Success = false, Message = msg, ErrorDetail = OneCResponseErrors.Describe(ex) }; |
| | | 762 | | } |
| | 0 | 763 | | } |
| | | 764 | | |
| | | 765 | | // ─── Вспомогательные методы ──────────────────────────────────────────────── |
| | | 766 | | |
| | | 767 | | /// <summary> |
| | | 768 | | /// Сверяет строки перемещения с остатками на складе-отправителе. Любой сбой чтения остатков не должен |
| | | 769 | | /// ломать ответ — тогда возвращаем <c>null</c>, и пользователь получает прежнее сообщение. |
| | | 770 | | /// </summary> |
| | | 771 | | private async Task<string?> DiagnoseShortageAsync( |
| | | 772 | | string senderName, Guid senderGuid, IReadOnlyList<ODataTransferLine> lines, IReadOnlyList<OneCDocumentLine> docu |
| | | 773 | | { |
| | | 774 | | try |
| | | 775 | | { |
| | 0 | 776 | | var byNomenclature = lines |
| | 0 | 777 | | .Select((line, i) => (line.NomenclatureKey, Article: i < documentLines.Count ? documentLines[i].Article |
| | | 778 | | .GroupBy(x => x.NomenclatureKey) |
| | 0 | 779 | | .Take(30) |
| | 0 | 780 | | .ToList(); |
| | | 781 | | var warehouses = (await _referenceService.GetWarehousesAsync()).ToDictionary(w => w.RefKey, w => w.Descripti |
| | | 782 | | |
| | 0 | 783 | | var result = new List<TransferShortageLine>(); |
| | 0 | 784 | | foreach (var group in byNomenclature) |
| | | 785 | | { |
| | 0 | 786 | | var balances = await _odataClient.GetListAsync<ODataStockBalance>( |
| | 0 | 787 | | OneCRegisterEndpoint.WithCondition( |
| | 0 | 788 | | "AccumulationRegister_ЗапасыНаСкладах/Balance", |
| | 0 | 789 | | $"Номенклатура_Key eq guid'{group.Key}'")); |
| | | 790 | | var onSender = balances.Where(b => b.WarehouseKey == senderGuid).Sum(b => b.QuantityBalance); |
| | 0 | 791 | | var elsewhere = balances |
| | 0 | 792 | | .Where(b => b.WarehouseKey != senderGuid && b.QuantityBalance > 0) |
| | 0 | 793 | | .Select(b => (warehouses.TryGetValue(b.WarehouseKey, out var name) ? name : b.WarehouseKey.ToString( |
| | 0 | 794 | | .ToList(); |
| | | 795 | | result.Add(new TransferShortageLine(group.First().Article, group.Sum(x => x.Quantity), onSender, elsewhe |
| | 0 | 796 | | } |
| | | 797 | | |
| | 0 | 798 | | return OneCTransferShortage.Build(senderName, result); |
| | | 799 | | } |
| | 0 | 800 | | catch (Exception ex) |
| | | 801 | | { |
| | 0 | 802 | | _logger.LogInformation(ex, "[OData] Не удалось сверить остатки для причины отказа перемещения"); |
| | 0 | 803 | | return null; |
| | | 804 | | } |
| | 0 | 805 | | } |
| | | 806 | | |
| | | 807 | | /// <summary> |
| | | 808 | | /// 1С может принять POST документа, но тихо отбросить строку табличной части. |
| | | 809 | | /// До проведения сверяем фактически созданные строки; одинаковая номенклатура может быть |
| | | 810 | | /// объединена 1С, поэтому сравнение выполняется по суммарному количеству на Ref_Key. |
| | | 811 | | /// </summary> |
| | | 812 | | private async Task<string?> ValidateCreatedTransferDocumentAsync( |
| | | 813 | | Guid documentRefKey, |
| | | 814 | | IReadOnlyCollection<ODataTransferLine> expectedLines) |
| | | 815 | | { |
| | 0 | 816 | | var rawDocument = await _odataClient.GetRawJsonAsync(TransferEndpoint, documentRefKey); |
| | 0 | 817 | | return VerifyCreatedTransferDocumentContents(rawDocument, expectedLines); |
| | 0 | 818 | | } |
| | | 819 | | |
| | | 820 | | internal static string? VerifyCreatedTransferDocumentContents( |
| | | 821 | | string? rawDocument, |
| | | 822 | | IReadOnlyCollection<ODataTransferLine> expectedLines) |
| | | 823 | | { |
| | 3 | 824 | | if (string.IsNullOrWhiteSpace(rawDocument) || rawDocument == "{}") |
| | 1 | 825 | | return "не удалось повторно прочитать созданный документ из 1С для сверки строк"; |
| | | 826 | | |
| | 2 | 827 | | var expected = expectedLines |
| | 4 | 828 | | .GroupBy(line => line.NomenclatureKey) |
| | 12 | 829 | | .ToDictionary(group => group.Key, group => group.Sum(line => line.Quantity)); |
| | | 830 | | |
| | | 831 | | try |
| | | 832 | | { |
| | 2 | 833 | | var rows = JObject.Parse(rawDocument)["Запасы"] as JArray; |
| | 2 | 834 | | if (rows == null) |
| | 0 | 835 | | return "1С вернула документ без табличной части «Запасы»"; |
| | | 836 | | |
| | 2 | 837 | | var actual = rows |
| | 2 | 838 | | .Select(row => new |
| | 2 | 839 | | { |
| | 2 | 840 | | NomenclatureKey = Guid.TryParse(row?["Номенклатура_Key"]?.Value<string>(), out var key) |
| | 2 | 841 | | ? key |
| | 2 | 842 | | : Guid.Empty, |
| | 2 | 843 | | Quantity = row?["Количество"]?.Value<decimal>() ?? 0 |
| | 2 | 844 | | }) |
| | 2 | 845 | | .GroupBy(line => line.NomenclatureKey) |
| | 8 | 846 | | .ToDictionary(group => group.Key, group => group.Sum(line => line.Quantity)); |
| | | 847 | | |
| | 2 | 848 | | if (expected.Count == actual.Count && expected.All(pair => |
| | 3 | 849 | | actual.TryGetValue(pair.Key, out var quantity) && quantity == pair.Value)) |
| | 1 | 850 | | return null; |
| | | 851 | | |
| | 2 | 852 | | static string Format(IReadOnlyDictionary<Guid, decimal> lines) => string.Join(", ", |
| | 3 | 853 | | lines.OrderBy(pair => pair.Key) |
| | 5 | 854 | | .Select(pair => $"{pair.Key}×{pair.Value}")); |
| | | 855 | | |
| | 1 | 856 | | return $"состав строк в 1С не совпадает с отправленным (ожидалось: {Format(expected)}; получено: {Format(act |
| | | 857 | | } |
| | 0 | 858 | | catch (Exception ex) when (ex is Newtonsoft.Json.JsonException or FormatException or InvalidCastException) |
| | | 859 | | { |
| | 0 | 860 | | return $"не удалось разобрать табличную часть «Запасы» созданного документа: {ex.Message}"; |
| | | 861 | | } |
| | 2 | 862 | | } |
| | | 863 | | |
| | | 864 | | private static string? GetZasylValue(Order? order) |
| | 0 | 865 | | => order?.OrderExtensions? |
| | 0 | 866 | | .FirstOrDefault(x => string.Equals(x.Key, ZasylKey, StringComparison.OrdinalIgnoreCase)) |
| | 0 | 867 | | ?.Value?.Trim(); |
| | | 868 | | |
| | | 869 | | private static string? GetEffectiveWarehouseName(Order? order) |
| | | 870 | | { |
| | 0 | 871 | | var zasyl = GetZasylValue(order); |
| | 0 | 872 | | return !string.IsNullOrWhiteSpace(zasyl) ? zasyl : order?.ShipmentWarehouse?.Name?.Trim(); |
| | | 873 | | } |
| | | 874 | | |
| | | 875 | | private static string? GetEffectiveWarehouseName(Order? order, Dictionary<int, string>? orderSupplierMap) |
| | | 876 | | { |
| | 0 | 877 | | if (orderSupplierMap != null && order != null && |
| | 0 | 878 | | orderSupplierMap.TryGetValue(order.Id, out var zasylFromMap) && |
| | 0 | 879 | | !string.IsNullOrWhiteSpace(zasylFromMap)) |
| | 0 | 880 | | return zasylFromMap.Trim(); |
| | 0 | 881 | | return GetEffectiveWarehouseName(order); |
| | | 882 | | } |
| | | 883 | | |
| | | 884 | | /// <summary> |
| | | 885 | | /// Склад-отправитель для документа 1С. Публичный, потому что предварительная проверка остатков |
| | | 886 | | /// обязана считать склад ровно так же, как создание документа, — иначе проверяется не тот склад. |
| | | 887 | | /// </summary> |
| | | 888 | | public static string? ResolveWarehouseFor1C( |
| | | 889 | | Order order, |
| | | 890 | | Dictionary<int, string>? orderSupplierMap, |
| | | 891 | | List<WarehouseMapping>? warehouseMappings) |
| | | 892 | | { |
| | 6 | 893 | | if (orderSupplierMap != null && |
| | 6 | 894 | | orderSupplierMap.TryGetValue(order.Id, out var zasylFromMap) && |
| | 6 | 895 | | !string.IsNullOrWhiteSpace(zasylFromMap)) |
| | 1 | 896 | | return zasylFromMap.Trim(); |
| | | 897 | | |
| | 5 | 898 | | if (warehouseMappings != null) |
| | 5 | 899 | | return ShippedToCommissionerWarehouseResolver.ResolveSenderWarehouse(order, warehouseMappings); |
| | | 900 | | |
| | 0 | 901 | | return GetEffectiveWarehouseName(order); |
| | | 902 | | } |
| | | 903 | | |
| | | 904 | | private static string FormatODataDate(DateTime? documentDate) |
| | | 905 | | { |
| | 0 | 906 | | var tz = TimeZoneInfo.FindSystemTimeZoneById("Russian Standard Time"); |
| | 0 | 907 | | var effectiveDate = documentDate.HasValue |
| | 0 | 908 | | ? NormalizeToRussianTime(documentDate.Value, tz) |
| | 0 | 909 | | : TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, tz); |
| | 0 | 910 | | return effectiveDate.ToString("yyyy-MM-ddTHH:mm:ss"); |
| | | 911 | | } |
| | | 912 | | |
| | | 913 | | private static DateTime NormalizeToRussianTime(DateTime value, TimeZoneInfo tz) |
| | 0 | 914 | | => value.Kind switch |
| | 0 | 915 | | { |
| | 0 | 916 | | DateTimeKind.Utc => TimeZoneInfo.ConvertTimeFromUtc(value, tz), |
| | 0 | 917 | | DateTimeKind.Local => TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Local, tz), |
| | 0 | 918 | | _ => value |
| | 0 | 919 | | }; |
| | | 920 | | |
| | | 921 | | private static string BuildTransactionTitle(TransactionType transactionType, string? userName) |
| | | 922 | | { |
| | 0 | 923 | | var userPart = NormalizeUserName(userName); |
| | 0 | 924 | | return $"{transactionType.GetDisplayName()} (пользователь: {userPart})"; |
| | | 925 | | } |
| | | 926 | | |
| | | 927 | | private static string NormalizeUserName(string? userName) |
| | | 928 | | { |
| | 0 | 929 | | if (string.IsNullOrWhiteSpace(userName)) return "Система"; |
| | 0 | 930 | | var n = userName.Trim(); |
| | 0 | 931 | | return n.Equals("system-auto", StringComparison.OrdinalIgnoreCase) || |
| | 0 | 932 | | n.Equals("system", StringComparison.OrdinalIgnoreCase) |
| | 0 | 933 | | ? "Система" |
| | 0 | 934 | | : n; |
| | | 935 | | } |
| | | 936 | | |
| | | 937 | | private static string FormatMissingItem((string Article, string? ProductName, decimal Qty) item) |
| | 0 | 938 | | => string.IsNullOrWhiteSpace(item.ProductName) |
| | 0 | 939 | | ? $"{item.Article} ×{item.Qty}" |
| | 0 | 940 | | : $"{item.ProductName} [{item.Article}] ×{item.Qty}"; |
| | | 941 | | |
| | | 942 | | internal static bool AllowsNomenclatureCreation(TransactionType transactionType) => |
| | 3 | 943 | | transactionType is not TransactionType.OrderedToSeller |
| | 3 | 944 | | and not TransactionType.ShippedToSeller |
| | 3 | 945 | | and not TransactionType.LostByCommissioner; |
| | | 946 | | |
| | | 947 | | /// <summary> |
| | | 948 | | /// Очищенный артикул из внешней системы может не совпадать с написанием в 1С. Если ProductKey |
| | | 949 | | /// сохраняет исходную часть до «=» со спецсимволом (PR-66622), ищем по ней. |
| | | 950 | | /// </summary> |
| | | 951 | | private static string GetArticleForNomenclatureSearch(Order order) |
| | | 952 | | { |
| | 0 | 953 | | var productKeyArticle = order.ProductKey?.Split('=', 2)[0]?.Trim(); |
| | 0 | 954 | | if (!string.IsNullOrWhiteSpace(productKeyArticle) && |
| | 0 | 955 | | productKeyArticle.Any(ch => !char.IsLetterOrDigit(ch))) |
| | 0 | 956 | | return productKeyArticle; |
| | | 957 | | |
| | 0 | 958 | | return order.Article?.Trim() ?? string.Empty; |
| | | 959 | | } |
| | | 960 | | |
| | | 961 | | internal static string BuildDraftComment(string comment, string draftReason) |
| | | 962 | | { |
| | 1 | 963 | | var suffix = draftReason.Length <= OneCCommentMaxLength |
| | 1 | 964 | | ? draftReason |
| | 1 | 965 | | : draftReason[..Math.Max(0, OneCCommentMaxLength - "… (перечень обрезан)".Length)] + "… (перечень обрезан)"; |
| | 1 | 966 | | var baseLimit = Math.Max(0, OneCCommentMaxLength - suffix.Length - 1); |
| | 1 | 967 | | var baseComment = comment.Length <= baseLimit ? comment : comment[..baseLimit]; |
| | 1 | 968 | | return string.IsNullOrEmpty(baseComment) ? suffix : $"{baseComment}\n{suffix}"; |
| | | 969 | | } |
| | | 970 | | |
| | | 971 | | private static string BuildComment( |
| | | 972 | | TransactionType transactionType, |
| | | 973 | | string? userName, |
| | | 974 | | string clientName, |
| | | 975 | | IEnumerable<string?> shipmentNumbers, |
| | | 976 | | string? extra = null) |
| | | 977 | | { |
| | 0 | 978 | | var title = BuildTransactionTitle(transactionType, userName); |
| | 0 | 979 | | var numbers = string.Join(", ", shipmentNumbers.Where(n => !string.IsNullOrEmpty(n))); |
| | 0 | 980 | | var comment = $"{title} для клиента {clientName}. Заказы: {numbers}"; |
| | 0 | 981 | | if (!string.IsNullOrEmpty(extra)) comment += $" {extra}"; |
| | 0 | 982 | | return comment; |
| | | 983 | | } |
| | | 984 | | } |