From 1c637ea862816ae6fa53945fa0327b95c79aa18b Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 22 八月 2025 16:20:27 +0800
Subject: [PATCH] 增强 WMS IP 地址处理逻辑的健壮性在 `TaskService.cs` 文件中，添加了对 `result` 是否为 `null` 的检查，以确保在反序列化之前 `result` 是有效的。同时，调整了对 `content.Data` 的检查逻辑，确保在 `content.Data` 不为空的情况下，才会进一步检查其值是否为 "NG"。如果是 "NG"，则设置 `task.Remark` 为 "NG"。这些更改提高了代码的健壮性，避免了潜在的空引用异常。
---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs
index 99f7612..ae56952 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs
@@ -60,6 +60,7 @@
Expression<Func<DtStockInfo, bool>> locationStatus = null;
Expression<Func<DtStockInfo, bool>> roadwayNo = null;
+ Expression<Func<DtStockInfo, bool>> materielCode = null;
foreach (var item in searchParametersList)
{
if (item.Name.Contains("locationStatus"))
@@ -70,20 +71,23 @@
{
roadwayNo = x => x.LocationInfo.RoadwayNo.Contains(item.Value);
}
+ else if (item.Name.Contains("materielCode"))
+ {
+ materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
+ }
}
-
- var data = BaseDal.Db.Queryable<DtStockInfo>().IncludesAllFirstLayer().WhereIF(!wheres.IsNullOrEmpty(), wheres).WhereIF(locationStatus != null, locationStatus).WhereIF(roadwayNo != null, roadwayNo).OrderBy(orderByModels).ToPageList(options.Page, options.Rows, ref totalCount);
+ //.IncludesAllFirstLayer()
+ var data = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ .WhereIF(locationStatus != null, locationStatus)
+ .WhereIF(roadwayNo != null, roadwayNo)
+ .WhereIF(materielCode != null, materielCode)
+ .OrderBy(orderByModels)
+ .ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtStockInfo>(totalCount, data);
return new PageGridData<DtStockInfo>(totalCount, data);
- //var data = base.GetPageData(options);
- //foreach (var item in data.Rows)
- //{
- // if (item.IsFull)
- // item.Remark = item.StockInfoDetails.Count().ToString();
- // else
- // item.Remark = "0";
- //}
- //return data;
}
/// <summary>
--
Gitblit v1.9.3