Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

wangxinhui

2025-09-06 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab

 项目代码/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs

@@ -127,6 +127,9 @@
                stockViewDTOs.ForEach(x =>
                    {
                        x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
                        x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
                        x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
                        x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
                    }
                );
                return new PageGridData<ProStockViewDTO>(totalCount + pktotalCount, stockViewDTOs.OrderByDescending(x=>x.CreateDate).ToList());
@@ -259,7 +262,9 @@
                stockViewDTOs.ForEach(x =>
                {
                    x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
                    x.StockRemark = warehouses.FirstOrDefault(v => v.WarehouseId == x.WarehouseId).WarehouseName;
                    x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
                    x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
                    x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
                }
                );