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

1
Back/Controllers/InvoiceController.cs
View File

@@ -834,6 +834,7 @@ namespace Back.Controllers
Type = TypeRemittance.Sale,
InvoiceID = InvoiceID,
Deleted = false,
CreateDt=DateTime.Now
}).ToList());
return Ok();
}

1
Back/Data/Models/Warehouse/Receipt.cs
View File

@@ -11,6 +11,7 @@ namespace Back.Data.Models.Warehouse
public int CODID { get; set; }
public decimal Count { get; set; }
public string Date { get; set; }
public DateTime CreateDt { get; set; }
public bool ForSale { get; set; }
public TypeReceipt Type { get; set; }
public string info { get; set; }

2
Back/Data/Models/Warehouse/Remittance.cs
View File

@@ -11,6 +11,8 @@ namespace Back.Data.Models.Warehouse
public int CODID { get; set; }
public decimal Count { get; set; }
public string Date { get; set; }
public DateTime CreateDt { get; set; }
public TypeRemittance Type { get; set; }
public string info { get; set; }
public int? InvoiceID { get; set; }

2096
Back/Migrations/20250125170646_cdt.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

41
Back/Migrations/20250125170646_cdt.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Back.Migrations
{
/// <inheritdoc />
public partial class cdt : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "CreateDt",
table: "Remittances",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
migrationBuilder.AddColumn<DateTime>(
name: "CreateDt",
table: "Receipts",
type: "datetime2",
nullable: false,
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CreateDt",
table: "Remittances");
migrationBuilder.DropColumn(
name: "CreateDt",
table: "Receipts");
}
}
}

7
Back/Migrations/SqlDbContextModelSnapshot.cs
View File

@@ -584,7 +584,6 @@ namespace Back.Migrations
b.Property<decimal?>("_cfee")
.HasColumnType("decimal(18,2)");
b.Property<decimal?>("am")
.HasMaxLength(36)
.HasColumnType("decimal(18,2)");
@@ -1471,6 +1470,9 @@ namespace Back.Migrations
b.Property<decimal>("Count")
.HasColumnType("decimal(18,2)");
b.Property<DateTime>("CreateDt")
.HasColumnType("datetime2");
b.Property<string>("Date")
.IsRequired()
.HasColumnType("nvarchar(max)");
@@ -1512,6 +1514,9 @@ namespace Back.Migrations
b.Property<decimal>("Count")
.HasColumnType("decimal(18,2)");
b.Property<DateTime>("CreateDt")
.HasColumnType("datetime2");
b.Property<string>("Date")
.IsRequired()
.HasColumnType("nvarchar(max)");

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

@@ -34,7 +34,8 @@ namespace Back.Services.Warehouse
info = item.info,
Type = item.Type,
InvoiceID=item.InvoiceID,
Deleted = false
Deleted = false,
CreateDt=DateTime.Now
};
var returnmodel = await _ReceiptRepo.AddAsync(model);
if (returnmodel != null)
@@ -61,6 +62,7 @@ namespace Back.Services.Warehouse
public async Task<ReceiptDto?> Update(ReceiptDto item)
{
var model= await _ReceiptRepo.Get(w => w.ID == item.ID).FirstOrDefaultAsync();
model.Date= item.Date.Replace("/", "");
model.CODID= item.CODID;
model.Count= item.Count;

3
Back/Services/Warehouse/RemittanceService.cs
View File

@@ -25,7 +25,8 @@ namespace Back.Services.Warehouse
info = item.info,
Type = item.Type,
InvoiceID = item.InvoiceID,
Deleted=false
Deleted=false,
CreateDt = DateTime.Now
};
var returnmodel = await _ReceiptRepo.AddAsync(model);
if (returnmodel != null)

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

1
Shared/DTOs/Warehouse/CirculationDto.cs
View File

@@ -37,5 +37,6 @@ namespace Shared.DTOs.Warehouse
[Display(Name = "نوع سند")]
public string msgType { get { return Type.GetEnumDisplayName(); } }
public int? invoiceID { get; set; }
public DateTime CreateDt { get; set; }
}
}

4
TaxPayerFull/Program.cs
View File

@@ -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("https://localhost:7075/api/") });
//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");