Browse Source

修改枚举 查询

集成Redis
郑勃旭 2 years ago
parent
commit
1f8529e4d4
  1. 2
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/PurchaseReceiptJobController.cs
  2. 24
      be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs
  3. 6
      build/src/docker/publish/conf/settings/appsettings.Development.json

2
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/PurchaseReceiptJobController.cs

@ -84,7 +84,7 @@ public class PurchaseReceiptJobController : AbpController
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
var jsonCodes = JsonSerializer.Serialize(wlgCodes); var jsonCodes = JsonSerializer.Serialize(wlgCodes);
List<int> status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; List<string> status = new List<string>() { EnumJobStatus.Open.ToString(), EnumJobStatus.Doing.ToString() };
var jsonStatus = JsonSerializer.Serialize(status); var jsonStatus = JsonSerializer.Serialize(status);
var request = new SfsJobRequestInputBase var request = new SfsJobRequestInputBase

24
be/Modules/Shared/src/Win_in.Sfs.Shared.Domain/Filters/FilterExtensions.cs

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection;
using System.Text.Json; using System.Text.Json;
using Volo.Abp; using Volo.Abp;
@ -204,6 +205,29 @@ public static class FilterExtensions
{ {
var parameterExpression = Expression.Parameter(typeof(T), "p"); var parameterExpression = Expression.Parameter(typeof(T), "p");
Type lstType = typeof(List<>).MakeGenericType(propertyType); Type lstType = typeof(List<>).MakeGenericType(propertyType);
if (propertyType.IsEnum)
{
var valueArrayStrings = JsonSerializer.Deserialize<List<string>>(filter.Value);
List<object> newValues = new List<object>();
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); object propertyValue = JsonSerializer.Deserialize(filter.Value, lstType);
if (propertyValue != null) if (propertyValue != null)
{ {

6
build/src/docker/publish/conf/settings/appsettings.Development.json

@ -122,10 +122,10 @@
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:21292/"
}, },
"Inventory": { "Inventory": {
"BaseUrl": "http://dev.ccwin-in.com:21295/" "BaseUrl": "http://localhost:59095/"
}, },
"Job": { "Job": {
"BaseUrl": "http://dev.ccwin-in.com:21295/" "BaseUrl": "http://localhost:59095/"
}, },
"Label": { "Label": {
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:21292/"
@ -134,7 +134,7 @@
"BaseUrl": "http://dev.ccwin-in.com:21292/" "BaseUrl": "http://dev.ccwin-in.com:21292/"
}, },
"Store": { "Store": {
"BaseUrl": "http://dev.ccwin-in.com:21295" "BaseUrl": "http://localhost:59095/"
} }
}, },
"Serilog": { "Serilog": {

Loading…
Cancel
Save