From 1f121db427cc068eee97b699c410d1b5f320e867 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 06 九月 2025 14:26:27 +0800 Subject: [PATCH] 最新代码提交 --- 项目代码/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs" index a98b78c..963efed 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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 ?? ""; } ); -- Gitblit v1.9.3