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-22 13:55:20 +03:30
parent 88d4b63394
commit e40192c428
8 changed files with 2223 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Back/Controllers/Warehouse/WarehouseController.cs
View File

@@ -13,6 +13,13 @@ namespace Back.Controllers.Warehouse
{
private readonly WarehouseService _warehouseService;
private readonly servUser _servUser;
public WarehouseController(WarehouseService warehouseService, servUser servUser)
{
_warehouseService = warehouseService;
_servUser = servUser;
}
[HttpGet("Circulation")]
public async Task<IActionResult> Circulation(string date = "", int CODID = 0, int PageIndex = 1, int PageSize = 5)
{

2086
Back/Migrations/20250122093421_tbswarehouse.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

92
Back/Migrations/20250122093421_tbswarehouse.cs Normal file
View File

@@ -0,0 +1,92 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Back.Migrations
{
/// <inheritdoc />
public partial class tbswarehouse : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<decimal>(
name: "Count",
table: "Remittances",
type: "decimal(18,2)",
nullable: false,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AddColumn<bool>(
name: "Deleted",
table: "Remittances",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<int>(
name: "InvoiceID",
table: "Remittances",
type: "int",
nullable: true);
migrationBuilder.AlterColumn<decimal>(
name: "Count",
table: "Receipts",
type: "decimal(18,2)",
nullable: false,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AddColumn<bool>(
name: "Deleted",
table: "Receipts",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<int>(
name: "InvoiceID",
table: "Receipts",
type: "int",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Deleted",
table: "Remittances");
migrationBuilder.DropColumn(
name: "InvoiceID",
table: "Remittances");
migrationBuilder.DropColumn(
name: "Deleted",
table: "Receipts");
migrationBuilder.DropColumn(
name: "InvoiceID",
table: "Receipts");
migrationBuilder.AlterColumn<int>(
name: "Count",
table: "Remittances",
type: "int",
nullable: false,
oldClrType: typeof(decimal),
oldType: "decimal(18,2)");
migrationBuilder.AlterColumn<int>(
name: "Count",
table: "Receipts",
type: "int",
nullable: false,
oldClrType: typeof(decimal),
oldType: "decimal(18,2)");
}
}
}

20
Back/Migrations/SqlDbContextModelSnapshot.cs
View File

@@ -1463,16 +1463,22 @@ namespace Back.Migrations
b.Property<int>("CODID")
.HasColumnType("int");
b.Property<int>("Count")
.HasColumnType("int");
b.Property<decimal>("Count")
.HasColumnType("decimal(18,2)");
b.Property<string>("Date")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<bool>("Deleted")
.HasColumnType("bit");
b.Property<bool>("ForSale")
.HasColumnType("bit");
b.Property<int?>("InvoiceID")
.HasColumnType("int");
b.Property<int>("Type")
.HasColumnType("int");
@@ -1498,13 +1504,19 @@ namespace Back.Migrations
b.Property<int>("CODID")
.HasColumnType("int");
b.Property<int>("Count")
.HasColumnType("int");
b.Property<decimal>("Count")
.HasColumnType("decimal(18,2)");
b.Property<string>("Date")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<bool>("Deleted")
.HasColumnType("bit");
b.Property<int?>("InvoiceID")
.HasColumnType("int");
b.Property<int>("Type")
.HasColumnType("int");

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

@@ -62,7 +62,16 @@ namespace Back.Services.Warehouse
RequestReceipt = RequestReceipt.Where(w => w.Date == date);
if (CODID != 0)
RequestReceipt = RequestReceipt.Where(w => w.CODID == CODID);
try
{
var item = await RequestReceipt.Union(RequestRemittance).OrderByDescending(o => o.Date).ToListAsync();
}
catch (Exception ex)
{
throw;
}
return await RequestReceipt.Union(RequestRemittance).OrderByDescending(o => o.Date).Paging(PageIndex, PageSize);
//var list = await RequestReceipt.ToListAsync();
//list.AddRange(await RequestRemittance.ToListAsync());