diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs index cb6ae48c9..84e46d947 100644 --- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs +++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs @@ -1,4 +1,5 @@ using System.IO; +using System.Text.Json.Serialization; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -83,6 +84,12 @@ public class StoreHttpApiHostModule : ModuleBase { base.ConfigureServices(context); ConfigureVirtualFileSystem(); + + //将枚举返回时都变为字符串 + //context.Services.AddControllers().AddJsonOptions(options => + //{ + // options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter()); + //}); //ConfigureSwaggerServices(context, context.Services.GetConfiguration()); } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs index b4a4ed2a3..9adb5c110 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs @@ -280,11 +280,11 @@ public class BalanceController : AbpController } } - if (listInput.inventoryStatuses != null && listInput.inventoryStatuses.Any()) - { - input.Condition.Filters.Add( - new Filter("Status", JsonSerializer.Serialize(listInput.inventoryStatuses), "In")); - } + //if (listInput.inventoryStatuses != null && listInput.inventoryStatuses.Any()) + //{ + // input.Condition.Filters.Add( + // new Filter("Status", JsonSerializer.Serialize(listInput.inventoryStatuses), "In")); + //} var balanceDTOs = await _balanceAppService.GetPagedListByFilterAsync(input, false).ConfigureAwait(false); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemPacks/ItemPackAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemPacks/ItemPackAutoMapperProfile.cs index 3b5b405af..8de7a1e0d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemPacks/ItemPackAutoMapperProfile.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemPacks/ItemPackAutoMapperProfile.cs @@ -22,6 +22,7 @@ public partial class BasedataApplicationAutoMapperProfile : Profile CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.TenantId) + .Ignore(x=>x.Id) .Ignore(x => x.ExtraProperties) .Ignore(x => x.ConcurrencyStamp) ; diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs index 3fc0120be..5fadcdde4 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs @@ -206,27 +206,28 @@ public static class FilterExtensions var parameterExpression = Expression.Parameter(typeof(T), "p"); Type lstType = typeof(List<>).MakeGenericType(propertyType); - if (propertyType.IsEnum) - { - var valueArrayStrings = JsonSerializer.Deserialize>(filter.Value); - List newValues = new List(); - - var enumValues = propertyType.GetEnumValues(); - - foreach (var valueArray in valueArrayStrings) - { - foreach (var enumValue in enumValues) - { - if (enumValue.ToString() == valueArray) - { - newValues.Add(enumValue); - break; - } - } - } - var newValue = JsonSerializer.Serialize(newValues); - filter.Value = newValue; - } + //转换枚举 + //if (propertyType.IsEnum) + //{ + // var valueArrayStrings = JsonSerializer.Deserialize>(filter.Value); + // List newValues = new List(); + + // var enumValues = propertyType.GetEnumValues(); + + // foreach (var valueArray in valueArrayStrings) + // { + // foreach (var enumValue in enumValues) + // { + // if (enumValue.ToString() == valueArray) + // { + // newValues.Add(enumValue); + // break; + // } + // } + // } + // var newValue = JsonSerializer.Serialize(newValues); + // filter.Value = newValue; + //} object propertyValue = JsonSerializer.Deserialize(filter.Value, lstType); if (propertyValue != null)