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

...

Browse Source
This commit is contained in:
mmrbnjd
2024-07-03 16:52:31 +03:30
parent 337b793e0b
commit 3d389b602d
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Back/Controllers/InvoiceController.cs
View File

@@ -474,11 +474,11 @@ namespace Back.Controllers
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
var code = Convert.ToInt32(DateTime.Now.ToString($"yMMdd{InvoiceID}Hmmss{user.RolUsers.First().CompanyID}"));
var code = DateTime.Now.ToString($"yMMdd{InvoiceID}Hmmss{user.RolUsers.First().CompanyID}");
Invoice? Invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, InvoiceID);
if (Invoice == null) return NotFound();
if (Invoice.ExternalAccessCode.HasValue)
return Ok(Invoice.ExternalAccessCode.Value.ToString());
if (!string.IsNullOrEmpty(Invoice.ExternalAccessCode))
return Ok(Invoice.ExternalAccessCode);
Invoice.ExternalAccessCode = code;
if (await _servInvoice.UpdateInvoice(Invoice))
@@ -490,9 +490,9 @@ namespace Back.Controllers
}
[HttpGet("GetReportByExternalAccessCode/{xternalAccessCode}")]
[AllowAnonymous]
public async Task<ActionResult<string>> GetReportByExternalAccessCode(int ExternalAccessCode)
public async Task<ActionResult<string>> GetReportByExternalAccessCode(string ExternalAccessCode)
{
if (ExternalAccessCode == null || ExternalAccessCode <= 0)
if (string.IsNullOrEmpty(ExternalAccessCode))
return NotFound();
string output = "";

2
Back/Data/Models/Invoice.cs
View File

@@ -97,7 +97,7 @@ namespace Back.Data.Models
#endregion
#region fild
public int? ExternalAccessCode { get; set; }
public string? ExternalAccessCode { get; set; }
public string Title { get; set; }
public string? Des { get; set; }
public InvoiceType invoiceType { get; set; }

3
Back/Services/servInvoice.cs
View File

@@ -43,6 +43,7 @@ namespace Back.Services
.Include(inc => inc.pattern)
.Select(s => new InvoiceDTO()
{
ExternalAccessCode=s.ExternalAccessCode,
IsDeleted=s.IsDeleted,
PatternID = s.PatternID,
PatternTitle = s.pattern.Title,
@@ -161,7 +162,7 @@ namespace Back.Services
return await _invoiceRepo.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
}
public async Task<Invoice> GetInvoiceByExternalAccessCode( int ExternalAccessCode)
public async Task<Invoice> GetInvoiceByExternalAccessCode( string ExternalAccessCode)
{
return await _invoiceRepo.Get(w => w.ExternalAccessCode == ExternalAccessCode && !w.IsDeleted).FirstOrDefaultAsync();