From 05a9d230c8f515bc59b491311bd2897b82164fab Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 12 七月 2025 18:31:49 +0800
Subject: [PATCH] 增强异常处理错误信息返回在 `TaskService.cs` 文件中,更新了异常处理逻辑,错误信息现在包含异常的堆栈跟踪信息 `ex.StackTrace`,以提供更详细的调试信息。

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs
index d6eceeb..dd6432e 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs
+++ b/Code Management/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>
@@ -147,4 +151,9 @@
             .ToDictionary(x => x.Key, x => x.Count());
         return result;
     }
+
+    //public override WebResponseContent UpdateData(DtStockInfo entity)
+    //{
+    //    return base.UpdateData(entity);
+    //}
 }
\ No newline at end of file

--
Gitblit v1.9.3