From a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 19:51:55 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 46 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs"
index 4371f76..2e53c0f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs"
@@ -2,6 +2,8 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_Core.HttpContextUser;
using WIDESEA_DTO.Stock;
using WIDESEA_IStockService;
@@ -31,16 +33,53 @@
public PageGridData<StockInfoDetailWithPalletDto> GetPageData2(PageDataOptions options)
{
- PageGridData<Dt_StockInfoDetail> lists = base.GetPageData (options);
+ // 1. 鑾峰彇鍩虹鍒嗛〉鏁版嵁
+ PageGridData<Dt_StockInfoDetail> pageData = base.GetPageData(options);
+ List<Dt_StockInfoDetail> filteredDetails = pageData.Rows.ToList(); // 鍏堟嫹璐濆師濮嬫暟鎹�
- List<int> stockIds = lists.Rows.Select(detail => detail.StockId).Distinct().ToList();
- var stocks= _stockinfoRepository.QueryData(x => stockIds.Contains(x.Id)).ToList();
-
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+ try
+ {
+ List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ if (searchParametersList?.Any() == true)
+ {
+ foreach (var param in searchParametersList)
+ {
+ // 鍖归厤鎵樼洏缂栧彿鏌ヨ鏉′欢锛堝皬鍐欏瓧娈靛悕锛�
+ if (param.Name.Equals(nameof(Dt_StockInfo.PalletCode).FirstLetterToLower(), StringComparison.OrdinalIgnoreCase)
+ && !string.IsNullOrEmpty(param.Value?.ToString()))
+ {
+ // 浼樺寲锛氭壒閲忔煡璇紙濡傛灉鏈夊涓墭鐩樼爜锛岃繖閲屼篃鍙互鎵╁睍锛�
+ string palletCode = param.Value.ToString().Trim();
+ var targetStock = _stockinfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- List<StockInfoDetailWithPalletDto> dtoList = lists.Rows
+ // 绌哄�兼牎楠岋細鏈壘鍒板搴旀墭鐩樼殑搴撳瓨锛岀洿鎺ヨ繃婊や负绌�
+ if (targetStock != null)
+ {
+ filteredDetails = filteredDetails.Where(x => x.StockId == targetStock.Id).ToList();
+ }
+ else
+ {
+ filteredDetails = new List<Dt_StockInfoDetail>();
+ }
+ break; // 鍗曚釜鎵樼洏鐮佹煡璇紝鍖归厤鍚庨��鍑哄惊鐜�
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+
+ List<int> stockIds = filteredDetails.Select(detail => detail.StockId).Distinct().ToList();
+ var stockDict = _stockinfoRepository.QueryData(x => stockIds.Contains(x.Id))
+ .ToDictionary(x => x.Id, x => x.PalletCode ?? "鏃犳墭鐩樼紪鍙�");
+
+ List<StockInfoDetailWithPalletDto> dtoList = filteredDetails
.Select(detail => new StockInfoDetailWithPalletDto
{
-
Id = detail.Id,
StockId = detail.StockId,
MaterielCode = detail.MaterielCode,
@@ -64,50 +103,18 @@
CreateDate = detail.CreateDate,
Modifier = detail.Modifier,
ModifyDate = detail.ModifyDate,
- PalletCode= stocks
- .FirstOrDefault(stock => stock.Id == detail.StockId)?
- .PalletCode ?? "鏃犳墭鐩樼紪鍙�"
+ PalletCode = stockDict.TryGetValue(detail.StockId, out var palletCode) ? palletCode : "鏃犳墭鐩樼紪鍙�"
})
.ToList();
- return new PageGridData<StockInfoDetailWithPalletDto> { Rows = dtoList, Total = lists.Total, Summary = lists.Summary };
- }
-
- public PageGridData<StockDetailDtO> GetPageDataByMateriel(PageDataOptions options)
- {
- PageGridData<Dt_StockInfoDetail> lists = base.GetPageData(options);
-
- List<StockDetailDtO> dtoList = lists.Rows.GroupBy(detail => new { detail.MaterielCode, detail.BatchNo, detail.SupplyCode }).Select(group =>
+ return new PageGridData<StockInfoDetailWithPalletDto>
{
- var firstItem = group.First();
- return new StockDetailDtO
- {
- Id = firstItem.Id,
- StockId = firstItem.StockId,
- MaterielCode = group.Key.MaterielCode,
- MaterielName = firstItem.MaterielName,
- OrderNo = firstItem.OrderNo,
- BatchNo = group.Key.BatchNo,
- ProductionDate = firstItem.ProductionDate,
- EffectiveDate = firstItem.EffectiveDate,
- SerialNumber = firstItem.SerialNumber,
- // 鏍稿績锛氬褰撳墠鍒嗙粍鐨凷tockQuantity姹傚拰
- StockQuantity = group.Sum(item => item.StockQuantity),
- OutboundQuantity = firstItem.OutboundQuantity,
- Status = firstItem.Status,
- Unit = firstItem.Unit,
- InboundOrderRowNo = firstItem.InboundOrderRowNo,
- SupplyCode = group.Key.SupplyCode,
- WarehouseCode = firstItem.WarehouseCode,
- Barcode = firstItem.Barcode,
- BusinessType = firstItem.BusinessType,
- Remark = firstItem.Remark
- };
- }).ToList();
-
-
- return new PageGridData<StockDetailDtO> { Rows = dtoList, Total = lists.Total, Summary = lists.Summary };
+ Rows = dtoList,
+ Total = pageData.Total,
+ Summary = pageData.Summary
+ };
}
+
}
- }
+ }
--
Gitblit v1.9.3