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-05-25 21:30:11 +03:30
parent e4cd267beb
commit 9df826b99e
6 changed files with 97 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Back/Common/eActionValidation.cs
View File

@@ -3,6 +3,7 @@
public enum eActionValidation
{
add,
update
update,
delete
}
}

16
Back/Controllers/InvoiceController.cs
View File

@@ -125,6 +125,11 @@ namespace Back.Controllers
if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice))
return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+
"برای ویرایش ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"});
else if (invoice.invoiceType != InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale)
{
return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" });
}
}
@@ -162,6 +167,17 @@ namespace Back.Controllers
if (invoice == null)
return NotFound();
//----Check TaxPayer
if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice))
return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+
"برای ویرایش ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"});
else if (invoice.invoiceType != InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale)
{
return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" });
}
invoice.LastChangeUserID = Convert.ToInt32(UserID);
//----Update and sendResult
return Ok(await _servInvoice.DeleteInvoice(invoice));

40
Back/Controllers/InvoiceItemController.cs
View File

@@ -63,10 +63,9 @@ namespace Back.Controllers
}
[HttpPost("UpdateItem/{invoiceID}")]
[HttpPut("UpdateItem/{invoiceID}")]
public async Task<ActionResult> UpdateItem([FromRoute] int invoiceID, [FromBody] InvoiceItemDTO model)
{
//کالا نمی تواند
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
@@ -92,7 +91,7 @@ namespace Back.Controllers
invoiceitem.am = model.am;
invoiceitem.fee = model.fee;
invoiceitem.dis = model.dis;
// invoiceitem.CODID = model.CODID;
invoiceitem.CODID = model.CODID;
if (await _servInvoice.UpdateInvoice(invoice))
return Ok(await _servInvoiceItem.Update(invoiceitem));
@@ -101,5 +100,40 @@ namespace Back.Controllers
}
[HttpDelete("DeleteItem/{invoiceID}/{invoiceItemID}")]
public async Task<ActionResult> UpdateItem([FromRoute] int invoiceID, [FromRoute] int invoiceItemID)
{
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//-----Validaton
var resultValidationmodel = await _validationInvoiceItem.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, invoiceID, new InvoiceItemDTO(), eActionValidation.delete)) ;
if (!resultValidationmodel.IsValid)
return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
//-----Get invoice
Invoice invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, invoiceID);
if (invoice == null)
return BadRequest(new List<string> { "invoice notFound..." });
var invoiceitem = await _servInvoiceItem.Getinvoiceitem(user.RolUsers.First().CompanyID, invoiceID, model.ID.Value);
if (invoiceitem == null)
return BadRequest(new List<string> { "invoice Item notFound..." });
invoice.LastChangeUserID = Convert.ToInt32(UserID);
if (await _servInvoice.UpdateInvoice(invoice))
return Ok(await _servInvoiceItem.Delete(invoiceitem));
else return BadRequest(new List<string> { "خطایی رخ داده" });
}
}
}

4
Back/Services/servInvoiceItem.cs
View File

@@ -19,6 +19,10 @@ namespace Back.Services
{
return await _invoiceitemRepo.UpdateAsync(item);
}
public async Task<bool> Delete(InvoiceItem item)
{
return await _invoiceitemRepo.DeleteAsync(item);
}
public async Task<bool> Exist(int companyID,int invoiceID,int invoiceitemID)
{
return await _invoiceitemRepo.Get(w => w.InvoiceID == invoiceID && w.ID == invoiceitemID && w.invoice.CompanyID == companyID).AnyAsync();

2
Back/Services/servTaxPayer.cs
View File

@@ -20,7 +20,7 @@ namespace Back.Services
}
public async Task<bool> ExistSuccessfulorSendorpendingInvoice(Invoice invoice)
{
return _repoSentTax.Get(w => /*w.InvoiceType == invoice.invoiceType &&*/ w.InvoiceID == invoice.ID &&
return _repoSentTax.Get(w => w.InvoiceType == invoice.invoiceType && w.InvoiceID == invoice.ID &&
(w.SentStatus == SentStatus.Successful || w.SentStatus == SentStatus.Send || w.SentStatus == SentStatus.pending)).Any();
}
public async Task<bool> CheckingTheCompanyKeyInformation(int CompanyID, string UniqeMemory, string PrivateKey, string EconomicCode)

54
Back/Validations/AUInvoiceItemValidation.cs
View File

@@ -23,8 +23,8 @@ namespace Back.Validations
});
});
When(m => m.Item4 == eActionValidation.update || m.Item4 == eActionValidation.add, () =>
{
RuleFor(r => r)
.Custom((model, context) =>
{
@@ -37,26 +37,6 @@ namespace Back.Validations
else context.AddFailure("کالا صحیح نمی باشد");
});
RuleFor(r => r)
.Custom((model, context) =>
{
if (model.Item2!=null && model.Item2 > 0)
{
var invoice = servInvoice.GetInvoiceByInvoiceID(model.Item1,model.Item2).Result;
if (invoice==null)
context.AddFailure("صورتحساب یافت نشد");
else
{
if ( servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice).Result)
context.AddFailure("این صورتحساب به سازمان ارسال شده"+'\n'+
"برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید");
}
}
else context.AddFailure("صورتحساب صحیح نمی باشد");
});
RuleFor(r => r.Item3.am)
.NotEmpty().WithMessage("تعداد مشخص نشده")
.NotNull().WithMessage("تعداد مشخص نشده");
@@ -73,6 +53,36 @@ namespace Back.Validations
});
});
RuleFor(r => r)
.Custom((model, context) =>
{
if (model.Item2!=null && model.Item2 > 0)
{
var invoice = servInvoice.GetInvoiceByInvoiceID(model.Item1,model.Item2).Result;
if (invoice==null)
context.AddFailure("صورتحساب یافت نشد");
else
{
if ( servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice).Result)
context.AddFailure("این صورتحساب به سازمان ارسال شده"+'\n'+
"برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید");
else if(invoice.invoiceType!=InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale)
{
context.AddFailure($"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود");
}
}
}
else context.AddFailure("صورتحساب صحیح نمی باشد");
});
}
}
}