From 4b483d9d06bead231b88ca212fd799196668a057 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 28 四月 2026 22:58:27 +0800
Subject: [PATCH] fix(任务服务): 修复出库任务选择逻辑和货位分配问题
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
index da3bb86..a0c6e4e 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs
@@ -16,6 +16,7 @@
using WIDESEA_Core.DB.Models;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+
//using WIDESEA_Core.HostedService;
using WIDESEA_Core.Utilities;
using ICacheService = WIDESEA_Core.Caches.ICacheService;
@@ -82,6 +83,7 @@
}
private PropertyInfo[] _propertyInfo { get; set; } = null;
+
public PropertyInfo[] TProperties
{
get
@@ -201,7 +203,6 @@
string? value = propertyValue?.ToString();
if (value == null) return p => true;
-
parameter = parameter ?? Expression.Parameter(typeof(TEntity), "x");
//创建节点的属性p=>p.name 属性name
MemberExpression memberProperty = Expression.PropertyOrField(parameter, propertyName);
@@ -274,21 +275,27 @@
case LinqExpressionType.Equal:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.Equal(member, constant), parameter);
break;
+
case LinqExpressionType.NotEqual:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.NotEqual(member, constant), parameter);
break;
+
case LinqExpressionType.GreaterThan:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.GreaterThan(member, constant), parameter);
break;
+
case LinqExpressionType.LessThan:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.LessThan(member, constant), parameter);
break;
+
case LinqExpressionType.ThanOrEqual:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.GreaterThanOrEqual(member, constant), parameter);
break;
+
case LinqExpressionType.LessThanOrEqual:
expression = Expression.Lambda<Func<TEntity, bool>>(Expression.LessThanOrEqual(member, constant), parameter);
break;
+
case LinqExpressionType.Contains:
case LinqExpressionType.NotContains:
MethodInfo? method = typeof(string).GetMethod("Contains", new[] { typeof(string) });
@@ -309,6 +316,7 @@
expression = p => true;
}
break;
+
default:
expression = p => false;
break;
@@ -346,8 +354,6 @@
}
return new Dictionary<string, OrderByType> { { "CreateDate", pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc } };
}
-
-
//private string GetDataRole(Type type)
//{
@@ -721,7 +727,6 @@
{
content = WebResponseContent.Instance.Error("未找到主表主键值");
}
-
}
catch (Exception ex)
{
@@ -964,4 +969,4 @@
return content;
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3