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-26 13:04:53 +03:30
parent 9df826b99e
commit 58940b9e50
3 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Back/Controllers/InvoiceController.cs
View File

@@ -48,8 +48,8 @@ namespace Back.Controllers
[HttpPost("Add")] [HttpPost("Add")]
public async Task<ActionResult<int>> Add([FromBody] NUInvoiceDTO item) public async Task<ActionResult<int>> Add([FromBody] NUInvoiceDTO item)
{ {
if(string.IsNullOrEmpty(item.InvoiceDate)) if (string.IsNullOrEmpty(item.InvoiceDate))
item.InvoiceDate = DateTime.Now.ConvertMiladiToShamsi(); item.InvoiceDate = DateTime.Now.ConvertMiladiToShamsi();
if (string.IsNullOrEmpty(item.InvoicIssueDate)) if (string.IsNullOrEmpty(item.InvoicIssueDate))
item.InvoicIssueDate = DateTime.Now.ConvertMiladiToShamsi(); item.InvoicIssueDate = DateTime.Now.ConvertMiladiToShamsi();
@@ -78,21 +78,21 @@ namespace Back.Controllers
//} //}
return Ok(_servInvoice.AddInvoice(new Invoice() return Ok(_servInvoice.AddInvoice(new Invoice()
{ {
Title = item.Title, Title = item.Title,
Des = item.Des, Des = item.Des,
invoiceType = InvoiceType.Bidding, invoiceType = InvoiceType.Bidding,
CustomerID = item.CustomerID, CustomerID = item.CustomerID,
CompanyID = user.RolUsers.First().CompanyID, CompanyID = user.RolUsers.First().CompanyID,
InvoicIssueDate = item.InvoicIssueDate.Replace("/", ""), InvoicIssueDate = item.InvoicIssueDate.Replace("/", ""),
InvoiceDate = item.InvoicIssueDate.Replace("/", ""), InvoiceDate = item.InvoicIssueDate.Replace("/", ""),
LastChangeUserID = Convert.ToInt32(UserID), LastChangeUserID = Convert.ToInt32(UserID),
BillReference = null, BillReference = null,
IsDeleted = false, IsDeleted = false,
PatternID = item.PatternID PatternID = item.PatternID
})); }));
@@ -114,7 +114,7 @@ namespace Back.Controllers
return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList()); return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
//-----Get invoice //-----Get invoice
Invoice invoice =await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID,item.ID.Value); Invoice invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, item.ID.Value);
if (invoice == null) if (invoice == null)
return BadRequest(new List<string> { "invoice notFound..." }); return BadRequest(new List<string> { "invoice notFound..." });
@@ -124,11 +124,17 @@ namespace Back.Controllers
//----Check TaxPayer //----Check TaxPayer
if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice)) if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice))
return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+ return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+
"برای ویرایش ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"}); "برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"});
else if (invoice.invoiceType != InvoiceType.Bidding else if (invoice.invoiceType != InvoiceType.BackFrmSale)
&& invoice.invoiceType != InvoiceType.Sale)
{ {
return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" }); return BadRequest(new List<string>
{ "صورتحساب در وضعیت برگشت از فروش نمی تواند ویرایش شود" });
}
else if (invoice.invoiceType != InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale && invoice.invoiceType != InvoiceType.Repair)
{
return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود"+'\n'+
$"فقط در حالت پیش نویس ، فاکتور و اصلاح (که به سازمان ارسال نشده باشد) میتوان سند را ویرایش کرد" });
} }
} }
@@ -140,7 +146,7 @@ namespace Back.Controllers
invoice.PatternID = item.PatternID; invoice.PatternID = item.PatternID;
if(item.CustomerID > 0) if (item.CustomerID > 0)
invoice.CustomerID = item.CustomerID; invoice.CustomerID = item.CustomerID;
if (!string.IsNullOrEmpty(item.InvoicIssueDate)) if (!string.IsNullOrEmpty(item.InvoicIssueDate))
@@ -163,7 +169,7 @@ namespace Back.Controllers
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//-----Get invoice //-----Get invoice
Invoice invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID,ID); Invoice invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, ID);
if (invoice == null) if (invoice == null)
return NotFound(); return NotFound();
@@ -171,12 +177,12 @@ namespace Back.Controllers
//----Check TaxPayer //----Check TaxPayer
if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice)) if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice))
return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+ return BadRequest(new List<string> { "این صورتحساب به سازمان ارسال شده"+'\n'+
"برای ویرایش ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"}); "برای حذف ،صورتحساب را ابطال بزنید"});
else if (invoice.invoiceType != InvoiceType.Bidding //else if (invoice.invoiceType != InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale) // && invoice.invoiceType != InvoiceType.Sale)
{ //{
return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" }); // return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" });
} //}
invoice.LastChangeUserID = Convert.ToInt32(UserID); invoice.LastChangeUserID = Convert.ToInt32(UserID);
//----Update and sendResult //----Update and sendResult
@@ -190,7 +196,7 @@ namespace Back.Controllers
var UserID = claim.Value; var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
Invoice? Invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID,InvoiceID); Invoice? Invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, InvoiceID);
if (Invoice == null) return NotFound(); if (Invoice == null) return NotFound();
if (Invoice.invoiceType == InvoiceType.CANCEL) return BadRequest(new List<string> { "این صورتحساب لغو شده" }); if (Invoice.invoiceType == InvoiceType.CANCEL) return BadRequest(new List<string> { "این صورتحساب لغو شده" });
@@ -220,7 +226,7 @@ namespace Back.Controllers
return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType)); return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType));
case InvoiceType.Repair: case InvoiceType.Repair:
await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false); await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false);
return Ok(await _servInvoice.AddInvoice(new Invoice() return Ok(await _servInvoice.AddInvoice(new Invoice()
{ {
@@ -238,7 +244,7 @@ namespace Back.Controllers
}, false)); }, false));
case InvoiceType.BackFrmSale: case InvoiceType.BackFrmSale:
await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false); await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false);
return Ok(await _servInvoice.AddInvoice(new Invoice() return Ok(await _servInvoice.AddInvoice(new Invoice()
{ {
@@ -311,7 +317,7 @@ namespace Back.Controllers
return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType)); return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType));
case InvoiceType.BackFrmSale: case InvoiceType.BackFrmSale:
await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false); await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false);
return Ok(await _servInvoice.AddInvoice(new Invoice() return Ok(await _servInvoice.AddInvoice(new Invoice()
{ {
@@ -355,7 +361,7 @@ namespace Back.Controllers
return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType)); return Ok(await _servInvoice.ChangeInvoiceType(Invoice, invoiceType));
case InvoiceType.Repair: case InvoiceType.Repair:
await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false); await _servInvoice.ChangeInvoiceType(Invoice, invoiceType, false);
return Ok(await _servInvoice.AddInvoice(new Invoice() return Ok(await _servInvoice.AddInvoice(new Invoice()
{ {

16
Back/Controllers/InvoiceItemController.cs
View File

@@ -86,12 +86,20 @@ namespace Back.Controllers
if (invoiceitem == null) if (invoiceitem == null)
return BadRequest(new List<string> { "invoice Item notFound..." }); return BadRequest(new List<string> { "invoice Item notFound..." });
if (invoice.invoiceType==InvoiceType.BackFrmSale && invoiceitem.am < model.am)
return BadRequest(new List<string> { "در حالت برگشت از فروش تعداد آیتم فقط میتواند کاهشی باشد" });
invoice.LastChangeUserID = Convert.ToInt32(UserID); invoice.LastChangeUserID = Convert.ToInt32(UserID);
if (invoice.invoiceType == InvoiceType.BackFrmSale)
invoiceitem.am = model.am; invoiceitem.am = model.am;
invoiceitem.fee = model.fee; else
invoiceitem.dis = model.dis; {
invoiceitem.CODID = model.CODID; invoiceitem.am = model.am;
invoiceitem.fee = model.fee;
invoiceitem.dis = model.dis;
invoiceitem.CODID = model.CODID;
}
if (await _servInvoice.UpdateInvoice(invoice)) if (await _servInvoice.UpdateInvoice(invoice))
return Ok(await _servInvoiceItem.Update(invoiceitem)); return Ok(await _servInvoiceItem.Update(invoiceitem));
@@ -101,7 +109,7 @@ namespace Back.Controllers
} }
[HttpDelete("DeleteItem/{invoiceID}/{invoiceItemID}")] [HttpDelete("DeleteItem/{invoiceID}/{invoiceItemID}")]
public async Task<ActionResult> UpdateItem([FromRoute] int invoiceID, [FromRoute] int invoiceItemID) public async Task<ActionResult> DeleteItem([FromRoute] int invoiceID, [FromRoute] int invoiceItemID)
{ {
//-----GetUserAndCompany //-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");

14
Back/Validations/AUInvoiceItemValidation.cs
View File

@@ -10,6 +10,10 @@ namespace Back.Validations
{ {
public AUInvoiceItemValidation(servInvoice servInvoice,ServCOD servCOD, servTaxPayer servTaxPayer, servInvoiceItem servInvoiceItem) public AUInvoiceItemValidation(servInvoice servInvoice,ServCOD servCOD, servTaxPayer servTaxPayer, servInvoiceItem servInvoiceItem)
{ {
When(m => m.Item4 == eActionValidation.delete || m.Item4 == eActionValidation.add, () =>
{
});
When(m => m.Item4 == eActionValidation.update, () => When(m => m.Item4 == eActionValidation.update, () =>
{ {
RuleFor(r => r) RuleFor(r => r)
@@ -65,15 +69,21 @@ namespace Back.Validations
var invoice = servInvoice.GetInvoiceByInvoiceID(model.Item1,model.Item2).Result; var invoice = servInvoice.GetInvoiceByInvoiceID(model.Item1,model.Item2).Result;
if (invoice==null) if (invoice==null)
context.AddFailure("صورتحساب یافت نشد"); context.AddFailure("صورتحساب یافت نشد");
else else
{ {
if ( servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice).Result) if ( servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice).Result)
context.AddFailure("این صورتحساب به سازمان ارسال شده"+'\n'+ context.AddFailure("این صورتحساب به سازمان ارسال شده"+'\n'+
"برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"); "برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید");
else if ((model.Item4 == eActionValidation.add || model.Item4 == eActionValidation.delete)
&& invoice.invoiceType == InvoiceType.BackFrmSale)
context.AddFailure("آیتم های صورتحساب در وضعیت برگشت از فروش نمی تواند اضافه یا کم شود");
else if(invoice.invoiceType!=InvoiceType.Bidding else if(invoice.invoiceType!=InvoiceType.Bidding
&& invoice.invoiceType != InvoiceType.Sale) && invoice.invoiceType != InvoiceType.Sale && invoice.invoiceType != InvoiceType.Repair)
{ {
context.AddFailure($"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود"); context.AddFailure($"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" +'\n'+
$"فقط در حالت پیش نویس ، فاکتور و اصلاح (که به سازمان ارسال نشده باشد) میتوان سند را ویرایش کرد");
} }
} }
} }