Merge From ClientCheckoutApi
This commit is contained in:
@@ -58,6 +58,11 @@ public class CheckoutListClientDto
|
||||
/// لیست پیام های هشدار فیش حقوقی
|
||||
/// </summary>
|
||||
public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// آیا مبالغ مانند مساعده مغایرت دارند
|
||||
/// </summary>
|
||||
public bool HasAmountConflict { get; set; }
|
||||
}
|
||||
|
||||
public class CheckoutListClientSearchModel : PaginationRequest
|
||||
|
||||
@@ -85,7 +85,7 @@ public class CheckoutDto
|
||||
public List<CheckoutWarningMessageModel> CheckoutWarningMessageList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// نیاز به امزا دارد یا خیر
|
||||
/// نیاز به امضاء دارد یا خیر
|
||||
/// </summary>
|
||||
public bool HasSignCheckoutOption { get; set; }
|
||||
|
||||
|
||||
@@ -5290,6 +5290,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
|
||||
Signature = x.Signature == "1",
|
||||
PersonnelCode = x.PersonnelCode,
|
||||
IsUpdateNeeded = x.IsUpdateNeeded,
|
||||
HasAmountConflict = x.HasAmountConflict,
|
||||
CheckoutWarningMessageList = warningMessage.Select(wm => new CheckoutWarningMessageModel
|
||||
{
|
||||
WarningMessage = wm.WarningMessage,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using _0_Framework.Application;
|
||||
using _0_Framework.Application;
|
||||
using Company.Domain.ContractAgg;
|
||||
using CompanyManagment.App.Contracts.Checkout;
|
||||
using CompanyManagment.App.Contracts.Checkout.Dto;
|
||||
using CompanyManagment.App.Contracts.Checkout.Dto.ClientDto;
|
||||
using CompanyManagment.App.Contracts.Contract;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
@@ -18,11 +19,52 @@ public class CheckoutController : ClientBaseController
|
||||
_workshopId = authHelper.GetWorkshopId();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// لیست فیش حقوقی
|
||||
/// </summary>
|
||||
/// <param name="searchModel"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
public async Task<PagedResult<CheckoutListClientDto>> GetList(CheckoutListClientSearchModel searchModel)
|
||||
{
|
||||
var result = await _checkoutApplication.GetListForClient(_workshopId, searchModel);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// دریافت نوبت کاری
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("RotatingShift")]
|
||||
public async Task<RotatingShiftOfCheckoutDto> GetRotatingShift(long id)
|
||||
{
|
||||
var result = await _checkoutApplication.GetRotatingShiftApi(id);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// پرینت گروهی فیش حقوقی
|
||||
/// </summary>
|
||||
/// <param name="ids"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("GroupPrint")]
|
||||
public async Task<List<CheckoutPrintDto>> Print(List<long> ids)
|
||||
{
|
||||
var result = await _checkoutApplication.CheckoutPrint(ids);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// پرینت تکی فیش حقوقی
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("PrintOne")]
|
||||
public async Task<List<CheckoutPrintDto>> Print(long id)
|
||||
{
|
||||
var result = await _checkoutApplication.CheckoutPrint([id]);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user