Browse Source

[fix]ApiFox调试通过

线边仓缴库申请	api/wms/store/product-receipt-request/by-type/ProductReceipt_WIP
线边仓缴库记录	api/wms/store/product-receipt-note/by-type/ProductReceipt_WIP
集成Redis
贾荣国 2 years ago
parent
commit
00b8b26087
  1. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestEditInput.cs
  2. 9
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductReceiptRequests/Inputs/ProductReceiptRequestEditInput.cs

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
@ -70,7 +71,7 @@ public class ProductReceiptRequestEditInput : SfsStoreRequestCreateOrUpdateInput
/// 类型
/// </summary>
[Display(Name = "类型")]
public string EnumProductReceiptType { get; set; }
public EnumProductReceiptType Type { get; set; }
/// <summary>
/// 明细列表

9
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAppService.cs

@ -6,12 +6,14 @@ using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using DocumentFormat.OpenXml.Office.CustomUI;
using FluentValidation;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Validation;
using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain;
@ -176,7 +178,12 @@ public class ProductReceiptRequestAppService :
bool includeDetails = false,
CancellationToken cancellationToken = default)
{
Expression<Func<ProductReceiptRequest, bool>> expression = p => p.Type.ToString() == type;
if (!EnumProductReceiptType.TryParse(type, true, out EnumProductReceiptType enumType))
{
throw new AbpValidationException($"type {type} is not valid");
}
Expression<Func<ProductReceiptRequest, bool>> expression = p => p.Type == enumType;
if (requestInput.Condition.Filters?.Count > 0)
{
expression = expression.And(requestInput.Condition.Filters.ToLambda<ProductReceiptRequest>());

Loading…
Cancel
Save