From 693584e6c84f6292a29ba242aa9e47be200e451e Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:25:12 +0800
Subject: [PATCH] feat: 更新仓库枚举值和过滤条件，添加不等操作符支持 refactor: 重构任务和库存相关界面的查询逻辑 fix: 修复库存状态过滤条件错误问题 style: 统一代码格式和命名规范
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
index d9c8538..d71ebea 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs
@@ -538,10 +538,16 @@
/// <param name="dt"></param>
/// <param name="utc">T:鎸塙TC鏃堕棿璁＄畻(榛樿);F:鎸夋湰鍦版椂闂磋绠�</param>
/// <returns></returns>
+ /// <summary>
+ /// 鏃ユ湡杞负unix鍊�
+ /// </summary>
+ /// <param name="dt">鏃ユ湡鏃堕棿</param>
+ /// <param name="utc">T:鎸塙TC鏃堕棿璁＄畻(榛樿);F:鎸夋湰鍦版椂闂磋绠�</param>
+ /// <returns></returns>
public static double ToUnix(this DateTime dt, bool utc = true)
{
double intResult = 0;
- System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1));
+ System.DateTime startTime = TimeZoneInfo.ConvertTime(new System.DateTime(1970, 1, 1), TimeZoneInfo.Utc, TimeZoneInfo.Local);
intResult = (dt - startTime).TotalSeconds;
intResult = Math.Round(intResult, 0);
return intResult;
@@ -972,6 +978,15 @@
break;
case HtmlElementType.like:
linqExpression = LinqExpressionType.Contains;
+ break;
+ case HtmlElementType.thanorequal:
+ linqExpression = LinqExpressionType.ThanOrEqual;
+ break;
+ case HtmlElementType.lessorequal:
+ linqExpression = LinqExpressionType.LessThanOrEqual;
+ break;
+ case HtmlElementType.notequal:
+ linqExpression = LinqExpressionType.NotEqual;
break;
default:
linqExpression = LinqExpressionType.Equal;
--
Gitblit v1.9.3