mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2025-01-11 12:42:36 +03:30
parent 6d03fedbeb
commit 1d7ebaae8e
8 changed files with 4329 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Back/Services/Warehouse/WarehouseService.cs
View File

@@ -1,7 +1,9 @@
using Back.Data.Contracts;
using Back.Common;
using Back.Data.Contracts;
using Back.Data.Models.Warehouse;
using Microsoft.EntityFrameworkCore;
using Microsoft.OpenApi.Extensions;
using Shared.DTOs;
using Shared.DTOs.Warehouse;
using System;
using System.Collections.Generic;
@@ -21,7 +23,7 @@ namespace Back.Services.Warehouse
_RemittanceRepo = remittanceRepo;
_ReceiptRepo = receiptRepo;
}
public async Task<List<CirculationDto>> Circulation(int CompanyID,string date="",int CODID=0)
public async Task<PagingDto<CirculationDto>> Circulation(int CompanyID,string date="",int CODID=0,int PageIndex=1,int PageSize=5)
{
var RequestRemittance = _RemittanceRepo.Get(w => w.cODItem.CompanyID == CompanyID)
.Select(s=>new CirculationDto
@@ -57,9 +59,14 @@ namespace Back.Services.Warehouse
if (CODID != 0)
RequestReceipt = RequestReceipt.Where(w => w.CODID == CODID);
var list = await RequestReceipt.ToListAsync();
list.AddRange(await RequestRemittance.ToListAsync());
return list.OrderByDescending(o=>o.Date).ToList();
return await RequestReceipt.Union(RequestRemittance).OrderByDescending(o => o.Date).Paging(PageIndex, PageSize);
//var list = await RequestReceipt.ToListAsync();
//list.AddRange(await RequestRemittance.ToListAsync());
//return await list.OrderByDescending(o=>o.Date).AsQueryable().Paging(PageIndex, PageSize);
}
public async Task Inventory(int CompanyID,int CODID)
{
}
}
}