提交

pan

3 天以前 9dddf81e2da484d3b413059a6e834e6c2641e18f

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoDetailService.cs

@@ -1,4 +1,5 @@
using SqlSugar;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -33,16 +34,45 @@

        public PageGridData<StockInfoDetailWithPalletDto> GetPageData2(PageDataOptions options)
        {
            // 1. èŽ·å–基础分页数据
            PageGridData<Dt_StockInfoDetail> pageData = base.GetPageData(options);
            List<Dt_StockInfoDetail> filteredDetails = pageData.Rows.ToList(); // å…ˆæ‹·è´åŽŸå§‹æ•°æ®
            string wheres = ValidatePageOptions(options);

            var sugarQueryable = Db.Queryable<Dt_StockInfoDetail>().InnerJoin<Dt_StockInfo>((detail, item) => detail.StockId == item.Id)
                .Where((detail, item) =>item.StockStatus==StockStatusEmun.入库完成.ObjToInt());

            Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
            List<OrderByModel> orderByModels = new List<OrderByModel>();
            foreach (var item in orderbyDic)
            {
                if (item.Key.ToLower() == "id")
                {
                    OrderByModel orderByModel = new()
                    {
                        FieldName = "detail."+item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
                else
                {
                    OrderByModel orderByModel = new()
                    {
                        FieldName = item.Key,
                        OrderByType = item.Value
                    };
                    orderByModels.Add(orderByModel);
                }
          
            }
            int totalCount = 0;
            List<SearchParameters> searchParametersList = new List<SearchParameters>();


            if (!string.IsNullOrEmpty(options.Wheres))
            {
                try
                {
                    List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                    if (searchParametersList?.Any() == true)
                    searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                    if (searchParametersList != null && searchParametersList.Any())
                    {
                        foreach (var param in searchParametersList)
                        {
@@ -50,20 +80,7 @@
                            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);

                                // ç©ºå€¼æ ¡éªŒï¼šæœªæ‰¾åˆ°å¯¹åº”托盘的库存，直接过滤为空
                                if (targetStock != null)
                                {
                                    filteredDetails = filteredDetails.Where(x => x.StockId == targetStock.Id).ToList();
                                }
                                else
                                {
                                    filteredDetails = new List<Dt_StockInfoDetail>();
                                }
                                break; // å•ä¸ªæ‰˜ç›˜ç æŸ¥è¯¢ï¼ŒåŒ¹é…åŽé€€å‡ºå¾ªçŽ¯
                                sugarQueryable = sugarQueryable.Where((detail, item) => item.PalletCode.Contains(param.Value));
                            }
                        }
                    }
@@ -73,48 +90,43 @@
                }
            }

            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 ?? "无托盘编号"); 
            var data = sugarQueryable
             .WhereIF(!wheres.IsNullOrEmpty(), wheres)
             .OrderBy(orderByModels)
             .Select((detail, item) => new StockInfoDetailWithPalletDto
             {
                 Id = detail.Id,
                 StockId = detail.StockId,
                 MaterielCode = detail.MaterielCode,
                 MaterielName = detail.MaterielName,
                 OrderNo = detail.OrderNo,
                 BatchNo = detail.BatchNo,
                 ProductionDate = detail.ProductionDate,
                 EffectiveDate = detail.EffectiveDate,
                 SerialNumber = detail.SerialNumber,
                 StockQuantity = detail.StockQuantity,
                 OutboundQuantity = detail.OutboundQuantity,
                 Status = detail.Status,
                 Unit = detail.Unit,
                 InboundOrderRowNo = detail.InboundOrderRowNo,
                 SupplyCode = detail.SupplyCode,
                 WarehouseCode = detail.WarehouseCode,
                 Barcode = detail.Barcode,
                 BusinessType = detail.BusinessType,
                 Remark = detail.Remark,
                 Creater = detail.Creater,
                 CreateDate = detail.CreateDate,
                 Modifier = detail.Modifier,
                 ModifyDate = detail.ModifyDate,
                 PalletCode = item.PalletCode
             })
             .ToPageList(options.Page, options.Rows, ref totalCount);

            List<StockInfoDetailWithPalletDto> dtoList = filteredDetails
                .Select(detail => new StockInfoDetailWithPalletDto
                {
                    Id = detail.Id,
                    StockId = detail.StockId,
                    MaterielCode = detail.MaterielCode,
                    MaterielName = detail.MaterielName,
                    OrderNo = detail.OrderNo,
                    BatchNo = detail.BatchNo,
                    ProductionDate = detail.ProductionDate,
                    EffectiveDate = detail.EffectiveDate,
                    SerialNumber = detail.SerialNumber,
                    StockQuantity = detail.StockQuantity,
                    OutboundQuantity = detail.OutboundQuantity,
                    Status = detail.Status,
                    Unit = detail.Unit,
                    InboundOrderRowNo = detail.InboundOrderRowNo,
                    SupplyCode = detail.SupplyCode,
                    WarehouseCode = detail.WarehouseCode,
                    Barcode = detail.Barcode,
                    BusinessType = detail.BusinessType,
                    Remark = detail.Remark,
                    Creater = detail.Creater,
                    CreateDate = detail.CreateDate,
                    Modifier = detail.Modifier,
                    ModifyDate = detail.ModifyDate,
                    PalletCode = stockDict.TryGetValue(detail.StockId, out var palletCode) ? palletCode : "无托盘编号"
                })
                .ToList();

            return new PageGridData<StockInfoDetailWithPalletDto>
            {
                Rows = dtoList.Where(x=>x.PalletCode != "无托盘编号").ToList(),
                Total = pageData.Total,
                Summary = pageData.Summary
            };
            return new PageGridData<StockInfoDetailWithPalletDto>(totalCount, data);

        }

    }
    }
}