...

Back/Controllers/Warehouse/WarehouseController.cs

@@ -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)
         {

Back/Migrations/20250122093421_tbswarehouse.cs

@@ -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)");
+        }
+    }
+}

Back/Migrations/SqlDbContextModelSnapshot.cs

@@ -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");
 

Back/Services/Warehouse/WarehouseService.cs

@@ -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());

TaxPayerFull.sln

@@ -13,11 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "View", "View", "{25C58D68-C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "moadiran", "moadiran\moadiran.csproj", "{E209C152-76D5-469F-A969-B5BE5970CA7A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B482DB5-6DE6-4983-A3B2-36458EAEAD5F}"
-	ProjectSection(SolutionItems) = preProject
-		next.txt = next.txt
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

TaxPayerFull/Pages/UserPanel/Warehouse.razor

@@ -56,20 +56,23 @@
 @* action *@
 <div class="row">
     <div class="col-md-12">
-        <div class="mb-2">
-            <div class="row">
-                <div class="col-md-12">
+        <ul class="list-group fa-padding" >
+            <li class="list-group-item" data-toggle="modal" data-target="#issue">
+                <div class="row g-3">
                     <div class="col-auto">
-                        <Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary" @onclick="()=>Item(new CirculationDto(){Type=TypeCirculation.Receipt})">رسید جدید</Button>
-                    </div>
-                    <div class="col-auto">
-                        <Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary" @onclick="()=>Item(new CirculationDto(){Type=TypeCirculation.Remittance})">حواله جدید</Button>
-                    </div>
+                        <Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Warning" @onclick="()=>Item(new CirculationDto(){Type=TypeCirculation.Receipt})">رسید جدید</Button>
                     </div>
+                    <div class="col-auto" >
+                        <Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Success" @onclick="()=>Item(new CirculationDto(){Type=TypeCirculation.Remittance})">حواله جدید</Button>
                     </div>
                 </div>
+
+            </li>
+        </ul>
+       
     </div>
 </div>
+
 @* alert *@
 <div class="row">
     <Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">

TaxPayerFull/Program.cs

@@ -37,10 +37,10 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
 //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://moadiran.ir:444/api/") });
 
 //Home
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
+//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
 
 //farzan
-//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
 
 CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");