Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-07-30 88676143aeceaeec3bd108f9cd609c4f3470ba96

 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/MaterielnfoStatisticsService.cs

@@ -95,8 +95,8 @@
                        WarehouseId = a.WarehouseId,
                        MaterielCode = b.MaterielCode,
                        MaterielName = b.MaterielName,
                        StockQuantity = b.StockQuantity,
                        OutboundQuantity = b.OutboundQuantity,
                        StockQuantity =(decimal) b.StockQuantity,
                        OutboundQuantity =(decimal) b.OutboundQuantity,
                        StockStatus = a.StockStatus,
                        Unit = b.Unit,
                        Remark = a.Remark,
@@ -109,10 +109,11 @@
                var groupedData = new Dictionary<string, MaterielnfoStatisticsDTO>();
                foreach (var item in allData)
                {
                    // 纭繚鍒濆鍊间负decimal绫诲瀷
                    if (groupedData.ContainsKey(item.MaterielCode))
                    {
                        groupedData[item.MaterielCode].StockQuantity += item.StockQuantity;
                        groupedData[item.MaterielCode].OutboundQuantity += item.OutboundQuantity;
                        groupedData[item.MaterielCode].StockQuantity += Convert.ToDecimal(item.StockQuantity);
                        groupedData[item.MaterielCode].OutboundQuantity += Convert.ToDecimal(item.OutboundQuantity);
                    }
                    else
                    {
@@ -121,8 +122,8 @@
                            WarehouseId = item.WarehouseId,
                            MaterielCode = item.MaterielCode,
                            MaterielName = item.MaterielName,
                            StockQuantity = item.StockQuantity,
                            OutboundQuantity = item.OutboundQuantity,
                            StockQuantity = Convert.ToDecimal(item.StockQuantity),
                            OutboundQuantity = Convert.ToDecimal(item.OutboundQuantity),
                            StockStatus = item.StockStatus,
                            Unit = item.Unit,
                            Remark = item.Remark
@@ -224,8 +225,8 @@
                        WarehouseId = a.WarehouseId,
                        MaterielCode = b.MaterielCode,
                        MaterielName = b.MaterielName,
                        StockQuantity = b.StockQuantity,
                        OutboundQuantity = b.OutboundQuantity,
                        StockQuantity = (decimal)b.StockQuantity,
                        OutboundQuantity =(decimal) b.OutboundQuantity,
                        StockStatus = a.StockStatus,
                        Unit = b.Unit,
                        Remark = a.Remark,