Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

647556386

4 天以前 91ead18d0e92b6e1ed916c5159f3431bf2071a56

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

@@ -1,8 +1,12 @@
using SqlSugar;
using System.Collections.Generic;
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_Core.Utilities;
using WIDESEA_DTO.Stock;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -31,47 +35,74 @@

        public PageGridData<StockInfoDetailWithPalletDto> GetPageData2(PageDataOptions options)
        {
            PageGridData<Dt_StockInfoDetail> lists =  base.GetPageData (options);
            // 1. èŽ·å–基础分页数据
            ISugarQueryable<Dt_StockInfoDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_StockInfoDetail>();
            ISugarQueryable<Dt_StockInfo> sugarQueryable = BaseDal.Db.Queryable<Dt_StockInfo>();

            List<int> stockIds = lists.Rows.Select(detail => detail.StockId).Distinct().ToList();
            var stocks= _stockinfoRepository.QueryData(x => stockIds.Contains(x.Id)).ToList();
 

            List<StockInfoDetailWithPalletDto> dtoList = lists.Rows
                .Select(detail => new StockInfoDetailWithPalletDto
            if (!string.IsNullOrEmpty(options.Wheres))
            {
                try
                {
                    
                    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= stocks
                        .FirstOrDefault(stock => stock.Id == detail.StockId)?
                        .PalletCode ?? "无托盘编号"  
                })
                .ToList();
                    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);

            return new PageGridData<StockInfoDetailWithPalletDto> { Rows = dtoList, Total = lists.Total, Summary = lists.Summary  };
                                if (targetStock != null)
                                {
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.StockId == targetStock.Id);
                                }
                                break;
                            }
                        }
                    }
                }
                catch (Exception ex)
                {
                }
            }
            EntityProperties.ValidatePageOptions(options, ref sugarQueryable1);
            ISugarQueryable<StockInfoDetailWithPalletDto> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.Id == b.StockId).Select((b, a) => new StockInfoDetailWithPalletDto
            {
                    Id = b.Id,
                    StockId = b.StockId,
                    MaterielCode = b.MaterielCode,
                    MaterielName = b.MaterielName,
                    OrderNo = b.OrderNo,
                    BatchNo = b.BatchNo,
                    ProductionDate = b.ProductionDate,
                    EffectiveDate = b.EffectiveDate,
                    SerialNumber = b.SerialNumber,
                    StockQuantity = b.StockQuantity,
                    OutboundQuantity = b.OutboundQuantity,
                    Status = b.Status,
                    Unit = b.Unit,
                    InboundOrderRowNo = b.InboundOrderRowNo,
                    SupplyCode = b.SupplyCode,
                    WarehouseCode = b.WarehouseCode,
                    Barcode = b.Barcode,
                    BusinessType = b.BusinessType,
                    Remark = b.Remark,
                    Creater = b.Creater,
                    CreateDate = b.CreateDate,
                    Modifier = b.Modifier,
                    ModifyDate = b.ModifyDate,
                    PalletCode = a.PalletCode??"无托盘编号"
                });


            int totalCount = 0;
            var stockViewDTOs = list.ToPageList(options.Page, options.Rows, ref totalCount);
            return new PageGridData<StockInfoDetailWithPalletDto>(totalCount, stockViewDTOs);
            
        }

    }
 }
    }