fix 供应商入参
This commit is contained in:
@@ -13,6 +13,7 @@ using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
|
|||||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
|
||||||
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
|
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
|
||||||
using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
|
using Kurisu.AspNetCore.UnifyResultAndValidation.Aop;
|
||||||
|
using Kurisu.AspNetCore.Utils.Extensions;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using SqlSugar;
|
using SqlSugar;
|
||||||
@@ -230,7 +231,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest1 request)
|
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest1 request)
|
||||||
{
|
{
|
||||||
var data = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
var data = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
||||||
.Where(x => x.SettleMonth == request.SettleMonth)
|
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401" && x.BusinessPlaceCode == request.BusinessPlaceCode)
|
||||||
.Where(x => x.Valid)
|
.Where(x => x.Valid)
|
||||||
.FirstAsync();
|
.FirstAsync();
|
||||||
|
|
||||||
@@ -266,7 +267,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest2 request)
|
public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest2 request)
|
||||||
{
|
{
|
||||||
var data = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
var data = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
||||||
.Where(x => x.SettleMonth == request.SettleMonth)
|
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401" && x.BusinessPlaceCode == request.BusinessPlaceCode)
|
||||||
.Where(x => x.Valid)
|
.Where(x => x.Valid)
|
||||||
.FirstAsync();
|
.FirstAsync();
|
||||||
|
|
||||||
@@ -303,6 +304,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
{
|
{
|
||||||
var page = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
var page = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
||||||
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401")
|
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401")
|
||||||
|
.WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode))
|
||||||
.Where(x => x.Valid)
|
.Where(x => x.Valid)
|
||||||
.OrderByDescending(x => x.CreateTime)
|
.OrderByDescending(x => x.CreateTime)
|
||||||
.Select<SettlementSupplierPageResponse>()
|
.Select<SettlementSupplierPageResponse>()
|
||||||
@@ -328,6 +330,7 @@ public class AssignmentsController : ControllerBase
|
|||||||
{
|
{
|
||||||
var page = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
var page = await _dbContext.Queryable<SettlementSupplierMonthly>()
|
||||||
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401")
|
.Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401")
|
||||||
|
.WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode))
|
||||||
.OrderByDescending(x => x.CreateTime)
|
.OrderByDescending(x => x.CreateTime)
|
||||||
.Select<SettlementSupplierPageResponse>()
|
.Select<SettlementSupplierPageResponse>()
|
||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request);
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ public class ManuallySettlementSupplierRequest1
|
|||||||
|
|
||||||
[Range(0, double.MaxValue, ErrorMessage = "结算金额必须大于等于0")]
|
[Range(0, double.MaxValue, ErrorMessage = "结算金额必须大于等于0")]
|
||||||
public decimal Pay { get; set; }
|
public decimal Pay { get; set; }
|
||||||
|
|
||||||
|
public Guid BusinessPlaceCode { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ManuallySettlementSupplierRequest2
|
public class ManuallySettlementSupplierRequest2
|
||||||
@@ -18,4 +20,6 @@ public class ManuallySettlementSupplierRequest2
|
|||||||
|
|
||||||
[Range(0, double.MaxValue, ErrorMessage = "退款金额必须大于等于0")]
|
[Range(0, double.MaxValue, ErrorMessage = "退款金额必须大于等于0")]
|
||||||
public decimal Refund { get; set; }
|
public decimal Refund { get; set; }
|
||||||
|
|
||||||
|
public Guid BusinessPlaceCode { get; set; }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user