From 4d0ae22c1311f7d947c17ad986a5b1c91afd3ced Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 14:06:19 +0800
Subject: [PATCH] 新增托盘号查询功能并优化异常处理在 `ITaskService.cs` 中添加了 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询输送线执行中的任务。更新了 `TaskService.cs` 中的方法实现，保留原有查询功能并增强查询逻辑。在 `CommonConveyorLine_GWJob.cs` 中修改了 `ConveyorLineOutFinish` 方法，整合新查询逻辑并清理了注释代码。同时，增加了异常处理机制，提升了代码的健壮性。
---
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