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

createdf

Browse Source
This commit is contained in:
mmrbnjd
2025-01-25 20:46:47 +03:30
parent b57839a212
commit f2dd0bd837
11 changed files with 2158 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ namespace Back.Services.Warehouse
ModelTypeID = (int)s.Type,
ModelTypeTitle = s.Type.GetEnumDisplayName(),
invoiceID = s.InvoiceID,
CreateDt = s.CreateDt,
});
if (!string.IsNullOrEmpty(date))
RequestRemittance = RequestRemittance.Where(w => w.Date == date);
@@ -59,6 +60,7 @@ namespace Back.Services.Warehouse
ModelTypeTitle = s.Type.GetEnumDisplayName(),
invoiceID = s.InvoiceID,
ForSale = s.ForSale,
CreateDt = s.CreateDt,
});
if (!string.IsNullOrEmpty(date))
RequestReceipt = RequestReceipt.Where(w => w.Date == date);
@@ -69,7 +71,7 @@ namespace Back.Services.Warehouse
var Remittance = await RequestRemittance.ToListAsync();
return await itemsReceipt.Union(Remittance).OrderByDescending(o => o.Date).Paging(PageIndex, PageSize);
return await itemsReceipt.Union(Remittance).OrderByDescending(o => o.CreateDt).Paging(PageIndex, PageSize);
// return await RequestReceipt.Union(RequestRemittance).OrderByDescending(o => o.Date).Paging(PageIndex, PageSize);