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

...

Browse Source
This commit is contained in:
mmrbnjd
2025-01-19 17:53:59 +03:30
parent d14c474c6b
commit 25c72b2eb5
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Back/Controllers/InvoiceController.cs
View File

@@ -643,7 +643,7 @@ namespace Back.Controllers
var Inventory =await _warehouseService.Inventory(CompanyID.Value, item.CODID); var Inventory =await _warehouseService.Inventory(CompanyID.Value, item.CODID);
if (Inventory - item.TotalAm <= 0 ) if (Inventory - item.TotalAm <= 0 )
{ {
errors.Add($"مقدار کالا {item.CODID} کمتر از درخواست شماست"); errors.Add($"موجودی کالا {item.CODID} کمتر از درخواست شماست");
} }
} }
if (errors.Count==0) if (errors.Count==0)

54
Back/Controllers/InvoiceItemController.cs
View File

@@ -8,8 +8,10 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Shared.DTOs; using Shared.DTOs;
using Shared.Enums;
using System.Net; using System.Net;
using System.Runtime.ConstrainedExecution; using System.Runtime.ConstrainedExecution;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace Back.Controllers namespace Back.Controllers
{ {
@@ -23,6 +25,7 @@ namespace Back.Controllers
private readonly AUInvoiceItemValidation _validationInvoiceItem; private readonly AUInvoiceItemValidation _validationInvoiceItem;
private readonly servInvoice _servInvoice; private readonly servInvoice _servInvoice;
private readonly RemittanceService _remittanceService; private readonly RemittanceService _remittanceService;
private readonly WarehouseService _warehouseService;
public InvoiceItemController(servInvoiceItem servInvoiceItem, AUInvoiceItemValidation validationInvoiceItem public InvoiceItemController(servInvoiceItem servInvoiceItem, AUInvoiceItemValidation validationInvoiceItem
, servUser servUser, servInvoice servInvoice) , servUser servUser, servInvoice servInvoice)
{ {
@@ -63,22 +66,41 @@ namespace Back.Controllers
if (await _servInvoice.UpdateInvoice(invoice)) if (await _servInvoice.UpdateInvoice(invoice))
{ {
if (await _remittanceService.HasaRemittance(model.invoiceID, model.item.CODID))
{
//check mojodi //check mojodi
//add //add
var inv = await _warehouseService.Inventory(user.RolUsers.First().CompanyID, model.item.CODID);
if (inv- model.item.am <= 0)
{
return BadRequest(new List<string> { "موجودی کالا کمتر از درخواست شماست" });
}
else
{
await _remittanceService.ADD(new Shared.DTOs.Warehouse.RemittanceDto()
{
CODID = model.item.CODID,
Count = model.item.am,
Date = DateTime.Now.ConvertMiladiToShamsi(),
info = $"حواله خودکار از صورتحساب {model.invoiceID}",
InvoiceID = model.invoiceID,
Type = TypeRemittance.Sale
});
return Ok(await _servInvoiceItem.Add(new InvoiceItem
{
am = model.item.am,
fee = model.item.fee,
dis = model.item.dis,
CODID = model.item.CODID,
InvoiceID = model.invoiceID,
}));
} }
return Ok(await _servInvoiceItem.Add(new InvoiceItem
{
am = model.item.am,
fee = model.item.fee,
dis = model.item.dis,
CODID = model.item.CODID,
InvoiceID = model.invoiceID,
}));
} }
else return BadRequest(new List<string> { "خطایی رخ داده" }); else return BadRequest(new List<string> { "خطایی رخ داده" });
@@ -166,12 +188,14 @@ namespace Back.Controllers
if (await _servInvoice.UpdateInvoice(invoice)) if (await _servInvoice.UpdateInvoice(invoice))
{ {
if (await _remittanceService.HasaRemittance(invoiceitem.invoice.ID, invoiceitem.CODID)) if (await _remittanceService.HasaRemittance(invoiceitem.invoice.ID, invoiceitem.CODID))
{
await _remittanceService.DeleteByInvoiceIDandCODID(invoiceitem.invoice.ID, invoiceitem.CODID); await _remittanceService.DeleteByInvoiceIDandCODID(invoiceitem.invoice.ID, invoiceitem.CODID);
//check mojodi
//add var inv = await _warehouseService.Inventory(user.RolUsers.First().CompanyID, model.item.CODID);
} if (inv - model.item.am <= 0)
return Ok(await _servInvoiceItem.Update(invoiceitem)); return BadRequest(new List<string> { "موجودی کالا کمتر از درخواست شماست" });
else
return Ok(await _servInvoiceItem.Update(invoiceitem));
} }
else return BadRequest(new List<string> { "خطایی رخ داده" }); else return BadRequest(new List<string> { "خطایی رخ داده" });