From cd7253920c5e597f6a8eefe813dd039bf1a5894b Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 07 十二月 2025 13:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs | 35 -----------------------------------
1 files changed, 0 insertions(+), 35 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..61edf7a 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"
@@ -73,41 +73,6 @@
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 =>
- {
- 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 };
- }
}
}
--
Gitblit v1.9.3