Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.80' of https://git.aycode.com/Adam/Mango.Nop.Plugins into 4.80

This commit is contained in:
Adam 2026-02-11 01:07:25 +01:00
parent 611df8f60f 9bc7d4a27e
commit 889c368a46
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/StockSignalREndpointServer.cs
View File

@ -4,6 +4,7 @@ using AyCode.Services.SignalRs;
using DevExpress.Data.Helpers; using DevExpress.Data.Helpers;
using FruitBank.Common.Entities; using FruitBank.Common.Entities;
using FruitBank.Common.Enums; using FruitBank.Common.Enums;
using FruitBank.Common.Interfaces;
using FruitBank.Common.Server.Interfaces; using FruitBank.Common.Server.Interfaces;
using FruitBank.Common.Server.Services.SignalRs; using FruitBank.Common.Server.Services.SignalRs;
using FruitBank.Common.SignalRs; using FruitBank.Common.SignalRs;
@ -43,6 +44,8 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC
}); });
if (result) return await ctx.StockTakings.GetByIdAsync(stockTakingId, false); if (result) return await ctx.StockTakings.GetByIdAsync(stockTakingId, false);
_logger.Error($"StockTaking closing ERROR! stockTakingId: {stockTakingId}");
return null; return null;
} }
@ -64,6 +67,12 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC
foreach (var productDto in productDtos) foreach (var productDto in productDtos)
{ {
//if (productDto.StockQuantity < 0 && productDto.IncomingQuantity > 0)
//{
// _logger.Info($"Beszállítás alatt lévő 'virtuális' készlet, nem leltározzuk! product: [#{productDto.Id}] {productDto.Name}; StockQuantity: {productDto.StockQuantity}; IncomingQuantity: {productDto.IncomingQuantity}");
// continue;
//}
var stockTakingItem = new StockTakingItem var stockTakingItem = new StockTakingItem
{ {
StockTakingId = stockTaking.Id, StockTakingId = stockTaking.Id,
@ -153,6 +162,7 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC
[SignalR(SignalRTags.AddOrUpdateMeasuredStockTakingItemPallet)] [SignalR(SignalRTags.AddOrUpdateMeasuredStockTakingItemPallet)]
public async Task<StockTakingItemPallet> AddOrUpdateMeasuredStockTakingItemPallet(StockTakingItemPallet stockTakingItemPallet) public async Task<StockTakingItemPallet> AddOrUpdateMeasuredStockTakingItemPallet(StockTakingItemPallet stockTakingItemPallet)
{ {
stockTakingItemPallet.IsMeasured = true;
return await ctx.AddOrUpdateMeasuredStockTakingItemPallet(stockTakingItemPallet); return await ctx.AddOrUpdateMeasuredStockTakingItemPallet(stockTakingItemPallet);
} }
} }

3
Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs
View File

@ -46,7 +46,8 @@ public class OrderDtoDbTable : MgDtoDbTableBase<OrderDto, Order>
&& o.OrderStatusId != (int)OrderStatus.Cancelled && o.OrderStatusId != (int)OrderStatus.Cancelled
&& o.GenericAttributes.Any(ga => ga.Key == nameof(OrderDto.DateOfReceipt) && DateTime.Parse(ga.Value) >= fromDate.Date)); && o.GenericAttributes.Any(ga => ga.Key == nameof(OrderDto.DateOfReceipt) && DateTime.Parse(ga.Value) >= fromDate.Date));
public IQueryable<OrderDto> GetAllByProductId(int productId, bool loadRelations = true) => GetAll(loadRelations).Where(o => o.OrderItemDtos.Any(oi => oi.ProductId == productId)); public IQueryable<OrderDto> GetAllByProductId(int productId, bool loadRelations = true)
=> GetAll(loadRelations).Where(o => o.OrderItemDtos.Any(oi => oi.ProductId == productId));
public IQueryable<OrderDto> GetAllByProductIds(IEnumerable<int> productIds, bool loadRelations = true) public IQueryable<OrderDto> GetAllByProductIds(IEnumerable<int> productIds, bool loadRelations = true)
=> GetAll(loadRelations).Where(o => o.OrderItemDtos.Any(oi => productIds.Contains(oi.ProductId))); => GetAll(loadRelations).Where(o => o.OrderItemDtos.Any(oi => productIds.Contains(oi.ProductId)));

16
Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/StockTakingDbContext.cs
View File

@ -83,18 +83,24 @@ public class StockTakingDbContext : MgDbContextBase,
public async Task CloseStockTaking(int stockTakingId) public async Task CloseStockTaking(int stockTakingId)
{ {
Logger.Info($"CloseStockTaking invoked! stockTakingId: {stockTakingId}");
var count = 0;
var stockTaking = await StockTakings.GetByIdAsync(stockTakingId, true); var stockTaking = await StockTakings.GetByIdAsync(stockTakingId, true);
if (!stockTaking.IsReadyForClose()) throw new Exception($"Not all IsRequiredForMeasuring items are IsMeasured! IsReadyForClose: false;"); if (!stockTaking.IsReadyForClose()) throw new Exception($"Not all IsRequiredForMeasuring items are IsMeasured! IsReadyForClose: false;");
var count = 0; //TODO: Mi legyen az invalid item-ekkel? - J.
foreach (var stockTakingItem in stockTaking.StockTakingItems!.Where(stockTakingItem => stockTakingItem is { IsMeasured: true, IsInvalid: false })) foreach (var stockTakingItem in stockTaking.StockTakingItems!.Where(stockTakingItem => stockTakingItem is { IsMeasured: true, IsInvalid: false }))
{ {
count++; count++;
//await _fruitBankDbContext.UpdateStockQuantityAndWeightAsync(stockTakingItem.Product!, stockTakingItem.QuantityDiff, await _fruitBankDbContext.UpdateStockQuantityAndWeightAsync(stockTakingItem.Product!, stockTakingItem.QuantityDiff,
// $"Leltár által módosítva! stockTakingId: #{stockTaking.Id}, stockTakingItemId: #{stockTakingItem.Id}", $"Leltár által módosítva! stockTakingId: #{stockTaking.Id}, stockTakingItemId: #{stockTakingItem.Id}",
// stockTakingItem.NetWeightDiff); stockTakingItem.NetWeightDiff);
Logger.Debug($"CloseStockTaking.UpdateStockQuantityAndWeightAsync; {stockTakingItem.Product}; qntDiff: {stockTakingItem.QuantityDiff} db; netWeightDiff: {stockTakingItem.NetWeightDiff} kg");
} }
stockTaking.IsClosed = true; stockTaking.IsClosed = true;