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

Compare commits

base: Adam:910a7aa852fa4f6ff72968832eb6ea29a08b2583
Branches Tags
Adam:main
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
..
compare: Adam:15dbec5aad8d1049c1460f5e3fd66b60e4cb261b
Branches Tags
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
Adam:main

No commits in common. "910a7aa852fa4f6ff72968832eb6ea29a08b2583" and "15dbec5aad8d1049c1460f5e3fd66b60e4cb261b" have entirely different histories.
910a7aa852 ... 15dbec5aad

3 changed files with 6 additions and 22 deletions
Show Stats Expand all files Collapse all files

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

@ -4,7 +4,6 @@ using AyCode.Services.SignalRs;
using DevExpress.Data.Helpers;
using FruitBank.Common.Entities;
using FruitBank.Common.Enums;
using FruitBank.Common.Interfaces;
using FruitBank.Common.Server.Interfaces;
using FruitBank.Common.Server.Services.SignalRs;
using FruitBank.Common.SignalRs;
@ -44,8 +43,6 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC
});
if (result) return await ctx.StockTakings.GetByIdAsync(stockTakingId, false);
_logger.Error($"StockTaking closing ERROR! stockTakingId: {stockTakingId}");
return null;
}
@ -67,12 +64,6 @@ public class StockSignalREndpointServer(StockTakingDbContext ctx, SignalRSendToC
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
{
StockTakingId = stockTaking.Id,

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

@ -46,8 +46,7 @@ public class OrderDtoDbTable : MgDtoDbTableBase<OrderDto, Order>
&& o.OrderStatusId != (int)OrderStatus.Cancelled
&& 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)
=> GetAll(loadRelations).Where(o => o.OrderItemDtos.Any(oi => productIds.Contains(oi.ProductId)));

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

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