From 18d2f40bbf40469b033de6f07ca8a8e3bc191132 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 26 四月 2025 19:21:40 +0800
Subject: [PATCH] 优化代码

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
index a248f3c..ab79b7d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
@@ -196,10 +196,16 @@
                         Row = dt_LocationInfo.Row
                     };
                     List<Dt_StockInfo> dt_StockInfos = StockInfos.Where(x => x.LocationCode == dt_LocationInfo.LocationCode).ToList();
+                    List<Dt_StockInfoDetail> Details = new List<Dt_StockInfoDetail>();
+                    foreach (var item in dt_StockInfos)
+                    {
+                        Details.AddRange(item.Details);
+                    }
+                    var BatchNo = string.Join(",", Details.GroupBy(x => x.BatchNo).Select(x => x.Key).ToList());
                     if (dt_StockInfos.Count > 0 && dt_StockInfos != null)
                     {
-                        locationStockView.BatchNo = dt_StockInfos.First().Details.First().BatchNo;
-                        locationStockView.InDate = dt_StockInfos.First().InDate;
+                        locationStockView.BatchNo = BatchNo;
+                        locationStockView.InDate = dt_StockInfos.OrderByDescending(x => x.InDate).First().InDate;
                         locationStockView.MaterielCode = dt_StockInfos.First().Details.First().MaterielCode;
                         locationStockView.MaterielName = dt_StockInfos.First().Details.First().MaterielName;
                         locationStockView.OrderNo = dt_StockInfos.First().Details.First().OrderNo;

--
Gitblit v1.9.3