箱库存的优化

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -3012,6 +3012,31 @@
             类型：1为入库，2为出库
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskGenerateDto.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxTaskDetailsGenerateDto">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskDetailsGenerateDto.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskDetailsGenerateDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskDetailsGenerateDto.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsGenerateDto">
             <summary>
             即时库存明细：生成dto

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -3686,6 +3686,14 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.BoxInventoryService.ExeTaskBox(System.Collections.Generic.List{WMS.Web.Domain.Entitys.SerialNumbers},System.Boolean)">
+            <summary>
+            盘点单-箱库存的变更：第二步骤，为了不是当前扫的所在箱里的序列号；如果是其它箱的需要减箱库存
+            </summary>
+            <param name="out_SerialNumbers"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.BoxInventoryService.ExeInStockBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryGenerateDto},System.Boolean)">
             <summary>
             入库单-箱库存变更

src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs

@@ -18,5 +18,30 @@ namespace WMS.Web.Core.Dto.Inventory
         /// 类型：1为入库，2为出库
         /// </summary>
         public int InventoryInOutType { get; set; }
+
+        /// <summary>
+        /// 明细
+        /// </summary>
+        public List<BoxTaskDetailsGenerateDto> Details { get; set; } = new List<BoxTaskDetailsGenerateDto>();
+    }
+
+    /// <summary>
+    /// 明细
+    /// </summary>
+    public class BoxTaskDetailsGenerateDto 
+    {
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public List<string> SerialNumbers { get; set; } = new List<string>();
     }
 }

src/WMS.Web.Domain/Services/BoxInventoryService.cs

@@ -1129,6 +1129,11 @@ namespace WMS.Web.Domain.Services
             var update_entitys = new List<BoxInventory>();
             var InventoryDetailsGenerateDto = new List<InventoryDetailsGenerateDto>();
 
+
+            var serNubs = dtoDatas.SelectMany(x => x.Details).SelectMany(x => x.SerialNumbers).ToList();
+            var serialNumbers = await _serialNumbersRepositories.GetEntityList(serNubs);
+            var out_serNubs = new List<SerialNumbers>();
+
             //2.获取“箱库存集合”
             var boxIds = dtoDatas.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
             var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
@@ -1158,6 +1163,22 @@ namespace WMS.Web.Domain.Services
                             }
                         }
                     });
+
+                    //找到：序列号不属于当前箱；找到后对应的箱子进行箱库存变更序列号
+                    foreach (var item in updateEntity.Details)
+                    {
+                        foreach (var itemSerNmb in item.SerialNumbers)
+                        {
+                            var current_item_SerNb = serialNumbers.Where(x => x.SerialNumber == itemSerNmb).FirstOrDefault();
+                            if (current_item_SerNb != null && current_item_SerNb.MaterialId == item.MaterialId && current_item_SerNb.BoxId != updateEntity.BoxId)
+                            {
+                                out_serNubs.Add(current_item_SerNb);
+                            }
+                        }
+
+                    }
+
+
                     //3.4明细添加新的物料
                     foreach (var detItem in dto.Details)
                     {
@@ -1206,6 +1227,19 @@ namespace WMS.Web.Domain.Services
                             }
                         }
                     });
+                    //找到：序列号不属于当前箱；找到后对应的箱子进行箱库存变更序列号
+                    foreach (var item in update_entity.Details)
+                    {
+                        foreach (var itemSerNmb in item.SerialNumbers)
+                        {
+                            var current_item_SerNb = serialNumbers.Where(x => x.SerialNumber == itemSerNmb).FirstOrDefault();
+                            if (current_item_SerNb != null && current_item_SerNb.MaterialId == item.MaterialId && current_item_SerNb.BoxId != update_entity.BoxId)
+                            {
+                                out_serNubs.Add(current_item_SerNb);
+                            }
+                        }
+                    }
+
                     //3.4明细添加新的物料
                     foreach (var detItem in dto.Details)
                     {
@@ -1243,6 +1277,12 @@ namespace WMS.Web.Domain.Services
                 isSuccess = await _boxInventoryRepositories.DeleteRange(delete_ids, isTransaction);
                 if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
             }
+
+            //盘点单-箱库存的变更：第二步骤，为了不是当前扫的所在箱里的序列号；如果是其它箱需要减箱库存
+            var result = await this.ExeTaskBox(out_serNubs, isTransaction);
+            if (!result.IsSuccess)
+                return result;
+
             //5.即时库存：处理
             //5.1先合并相同的数据
             var invDetGenDtos_in = InventoryDetailsGenerateDto.Where(x => x.InventoryInOutType == (int)InventoryInOutType.In).GroupBy(x => new { x.OrgCode, x.MaterialId, x.StockCode, x.SubStockId }).Select(x => new InventoryDetailsGenerateDto()
@@ -1276,44 +1316,76 @@ namespace WMS.Web.Domain.Services
             return Result.ReSuccess();
         }
 
-        private async Task<Result> ExeTaskBox(List<BoxTaskGenerateDto> sourceBox,List<string> serNubs, bool isTransaction)
+        /// <summary>
+        /// 盘点单-箱库存的变更：第二步骤，为了不是当前扫的所在箱里的序列号；如果是其它箱的需要减箱库存
+        /// </summary>
+        /// <param name="out_SerialNumbers"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        private async Task<Result> ExeTaskBox(List<SerialNumbers> out_SerialNumbers, bool isTransaction)
         {
-            //1.先通过序列号找到-序列号信息集合
+            var boxIds = out_SerialNumbers.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
-            var serialNumbers = await _serialNumbersRepositories.GetEntityList(serNubs);
+            var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
-            //2.找到序列号对应的boxId
-            var destBoxIds = serialNumbers.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
-            //3.找到box对应的箱库存
-            var boxInventorys = await _boxInventoryRepositories.GetList(destBoxIds);
 
-            var delete_ids = new List<int>();
+            var delete_ids1 = new List<int>();
-            var update_entitys = new List<BoxInventory>();
+            var update_entitys1 = new List<BoxInventory>();
+            var InventoryDetailsGenerateDto1 = new List<InventoryDetailsGenerateDto>();
+            foreach (var item in boxInventorys)
+            {
+                var update_entity = item;
 
-            ////遍历
+                foreach (var itemDet in item.Details)
-            //foreach (var destBoxId in destBoxIds)
+                {
-            //{
+                    var current_sers_info = out_SerialNumbers.Where(x => x.BoxId == item.BoxId && x.MaterialId == itemDet.MaterialId).ToList();
-            //    var sourBox= sourceBox.Where(x => x.BoxId == destBoxId).FirstOrDefault();
+                    if (current_sers_info != null && current_sers_info.Count != 0)
-            //    var destBoxInvent= boxInventorys.Where(x => x.BoxId == destBoxId).FirstOrDefault();
+                    {
-            //    if (sourBox==null && destBoxInvent!=null) 
+                        var uptDet = update_entity.Details.Where(d => d.MaterialId == itemDet.MaterialId).FirstOrDefault();
-            //    {
+                        uptDet.Qty = uptDet.Qty - current_sers_info.Count;
-            //        if(destBoxInvent)
+                        var crrent_sers = current_sers_info.Select(x => x.SerialNumber).ToList();
-            //        var updateEntity = boxInvent;
+                        uptDet.SerialNumbers.RemoveAll(r => crrent_sers.Contains(r));
-            //        updateEntity.Details = boxInvent.Details;
-            //        //3.3序列号重新给值：已有的物料
-            //        updateEntity.Details.ForEach(x =>
-            //        {
-            //            foreach (var detItem in dto.Details)
-            //            {
-            //                if (x.MaterialId == detItem.MaterialId)
-            //                {
-            //                    x.Qty = x.Qty + detItem.Qty;
-            //                    x.SerialNumbers = detItem.SerialNumbers;
-            //                }
-            //            }
-            //        });
-            //    }
-            //}
-            return null;
 
+
+                        //3.2.2组装即时库存dto
+                        var inventoryDet = new InventoryDetailsGenerateDto();
+                        inventoryDet.MaterialId = itemDet.MaterialId;
+                        inventoryDet.OrgCode = item.OrgCode;
+                        inventoryDet.StockCode = item.StockCode;
+                        inventoryDet.SubStockId = item.SubStockId;
+                        inventoryDet.Qty = current_sers_info.Count;
+                        inventoryDet.InventoryInOutType = (int)InventoryInOutType.Out;
+                        //3.2.2即时库存：修改的集合
+                        InventoryDetailsGenerateDto1.Add(inventoryDet);
+                    }
+                }
+
+                //4.1判断要修改的箱库存对象：是否所有的物料库存的数量都为0，“是”则删除该箱库存,"否"则修改；
+                var isAllNoInventory = update_entity.Details.All(x => x.Qty == 0);
+                if (isAllNoInventory)
+                    delete_ids1.Add(update_entity.Id);
+                else
+                    //4.2添加要更新的箱库存实体
+                    update_entitys1.Add(update_entity);
+            }
+
+            var isSuccess = true;
+            //4.数据库更新操作:更新和添加
+            if (update_entitys1.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.UpdateRange(update_entitys1, isTransaction);
+                if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            if (delete_ids1.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.DeleteRange(delete_ids1, isTransaction);
+                if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            if (InventoryDetailsGenerateDto1.Count != 0)
+            {
+                var InventoryDetailsGenerate_result = await _inventoryDetailsService.GenerateInventoryDetails(InventoryDetailsGenerateDto1, isTransaction);
+                if (!InventoryDetailsGenerate_result.IsSuccess)
+                    return InventoryDetailsGenerate_result;
+            }
+            return Result.ReSuccess();
         }
 
         /// <summary>
@@ -1355,7 +1427,7 @@ namespace WMS.Web.Domain.Services
                     {
                         MaterialId = d.Key.MaterialId,
                         Qty = d.Sum(t => t.Qty),
-                        SerialNumbers =  d.SelectMany(t => t.SerialNumbers).ToList()
+                        SerialNumbers = d.SelectMany(t => t.SerialNumbers).ToList()
                     }).ToList();
                     //3.4明细映射：用合并过的dto数据
                     addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dtoDets_merge);

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -52,98 +52,6 @@ namespace WMS.Web.Repositories
             _erpBasicDataExtendService = erpBasicDataExtendService;
         }
         
-        /// <summary>
-        /// 列表-分页
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto) 
-        {
-            //1.获取物料集合和组织集合和供应商的集合
-            var materials_result = await _erpService.BillQueryForMaterial();
-            if (!materials_result.IsSuccess)
-                return (new List<InStockQueryResponse>(), 0);
-            var materials = materials_result.Data.ToList();
-
-            //组织集合
-            var orgs_result = await _erpService.BillQueryForOrg();
-            if (!orgs_result.IsSuccess)
-                return (new List<InStockQueryResponse>(), 0);
-            var orgs = orgs_result.Data.ToList();
-
-            //供应商集合
-            var suppliers_result = await _erpService.BillQueryForSupplier();
-            if (!suppliers_result.IsSuccess)
-                return (new List<InStockQueryResponse>(), 0);
-            var suppliers = suppliers_result.Data.ToList();
-
-            //物料集合；模糊查询后的物料集合
-            if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
-
-            //var query=_context.InStockDetails
-            //    .GroupJoin(_context.Instock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
-            //    .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
-            //    .Where(adv => 1 == 1);
-            var query = _context.InStockTotalDetails
-                .GroupJoin(_context.Instock, detail => detail.InStockId, order => order.Id, (detail, orders) => new { detail, orders })
-                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
-                .Where(adv => 1 == 1);
-
-            if (!string.IsNullOrEmpty(dto.SourceBillNo))
-                query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
-
-            //物料ID在模糊后的物料
-            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
-            {
-                var mids = materials.Select(x => x.MaterialId).ToList();
-                query = query.Where(w => mids.Contains(w.detail.MaterialId));
-            }
-
-            if (dto.SupplierId.HasValue)
-                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
-
-            if (dto.OrgId.HasValue)
-                query = query.Where(w => w.order.OrgId == dto.OrgId.Value);
-
-            if (!string.IsNullOrEmpty(dto.StockCode))
-            {
-                var splitStrs = dto.StockCode.Split("_$");
-                query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]);
-            }
-
-            if (dto.Type.HasValue)
-                query = query.Where(w => (int)w.order.Type == dto.Type.Value);
-
-            if (dto.CreateBeginDate != null)
-                query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
-            if (dto.CreateEndDate != null)
-                query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
-
-            var tt= _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, "CK003" + "101");
-           
-            int total = await query.CountAsync();
-            var list = await query.Select(s => new InStockQueryResponse() 
-            {
-                Id=s.order.Id,
-                DetailsId=s.detail.Id,
-                BillNo=s.order.BillNo,
-                Type=s.order.Type.GetRemark(),
-                SourceBillNo=s.detail.SourceBillNo,
-                Supplier= _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
-                Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId),
-                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
-                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
-                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
-                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
-                Qty =s.detail.Qty,
-                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
-                CreateTime =s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
-                SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
-            }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
-
-            return (list, total);
-        }
 
         /// <summary>
         /// 箱是否存在于入库单明细中；（箱是否被上架了）
@@ -300,5 +208,92 @@ namespace WMS.Web.Repositories
 
             return res;
         }
+
+        /// <summary>
+        /// 列表-分页
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto)
+        {
+            //1.获取物料集合和组织集合和供应商的集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return (new List<InStockQueryResponse>(), 0);
+            var materials = materials_result.Data.ToList();
+
+            //组织集合
+            var orgs_result = await _erpService.BillQueryForOrg();
+            if (!orgs_result.IsSuccess)
+                return (new List<InStockQueryResponse>(), 0);
+            var orgs = orgs_result.Data.ToList();
+
+            //供应商集合
+            var suppliers_result = await _erpService.BillQueryForSupplier();
+            if (!suppliers_result.IsSuccess)
+                return (new List<InStockQueryResponse>(), 0);
+            var suppliers = suppliers_result.Data.ToList();
+
+            //物料集合；模糊查询后的物料集合
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
+
+            var query = _context.InStockTotalDetails
+                .GroupJoin(_context.Instock, detail => detail.InStockId, order => order.Id, (detail, orders) => new { detail, orders })
+                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                .Where(adv => 1 == 1);
+
+            if (!string.IsNullOrEmpty(dto.SourceBillNo))
+                query = query.Where(w => EF.Functions.Like(w.detail.SourceBillNo, "%" + dto.SourceBillNo + "%"));
+
+            //物料ID在模糊后的物料
+            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                var mids = materials.Select(x => x.MaterialId).ToList();
+                query = query.Where(w => mids.Contains(w.detail.MaterialId));
+            }
+
+            if (dto.SupplierId.HasValue)
+                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
+
+            if (dto.OrgId.HasValue)
+                query = query.Where(w => w.order.OrgId == dto.OrgId.Value);
+
+            if (!string.IsNullOrEmpty(dto.StockCode))
+            {
+                var splitStrs = dto.StockCode.Split("_$");
+                query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]);
+            }
+
+            if (dto.Type.HasValue)
+                query = query.Where(w => (int)w.order.Type == dto.Type.Value);
+
+            if (dto.CreateBeginDate != null)
+                query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
+            if (dto.CreateEndDate != null)
+                query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
+
+            int total = await query.CountAsync();
+            var list = await query.Select(s => new InStockQueryResponse()
+            {
+                Id = s.order.Id,
+                DetailsId = s.detail.Id,
+                BillNo = s.order.BillNo,
+                Type = s.order.Type.GetRemark(),
+                SourceBillNo = s.detail.SourceBillNo,
+                Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
+                Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgId),
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
+                Qty = s.detail.Qty,
+                Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
+                CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败",
+            }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
+
+            return (list, total);
+        }
     }
 }

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -56,117 +56,6 @@ namespace WMS.Web.Repositories
             _erpBasicDataExtendService = erpBasicDataExtendService;
         }        
 
-        /// <summary>
-        /// 列表-分页
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto)
-        {
-            //1.获取物料集合和组织集合
-            var materials_result = await _erpService.BillQueryForMaterial();
-            if (!materials_result.IsSuccess)
-                return (new List<InStockTaskQueryResponse>(), 0);
-            var materials = materials_result.Data.ToList();
-            //组织集合
-            var orgs_result = await _erpService.BillQueryForOrg();
-            if (!orgs_result.IsSuccess)
-                return (new List<InStockTaskQueryResponse>(), 0);
-            var orgs = orgs_result.Data.ToList();
-
-            //供应商集合
-            var suppliers_result = await _erpService.BillQueryForSupplier();
-            if (!suppliers_result.IsSuccess)
-                return (new List<InStockTaskQueryResponse>(), 0);
-            var suppliers = suppliers_result.Data.ToList();
-
-            List<int> ids_Receiver = new List<int>();
-            List<int> ids_Operator = new List<int>();
-            if (!string.IsNullOrEmpty(dto.Receiver) || !string.IsNullOrEmpty(dto.Operator))
-            {
-                var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
-                ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
-                ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
-            }
-
-            //物料集合；模糊查询后的物料集合
-            if (!string.IsNullOrEmpty(dto.MaterialNumber))
-                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
-
-            var query = _context.InStockTaskDetails
-                .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
-                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
-                .Where(adv => 1 == 1);
-
-            if (!string.IsNullOrEmpty(dto.SourceBillNo))
-                query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%"));
-
-            //物料ID在模糊后的物料
-            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
-            {
-                var mids = materials.Select(x => x.MaterialId).ToList();
-                query = query.Where(w => mids.Contains(w.detail.MaterialId));
-            }
-
-            if (ids_Receiver.Count() > 0)
-                query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId??0));
-            if (ids_Operator.Count() > 0)
-                query = query.Where(w => ids_Operator.Contains(w.order.ShelferId??0));
-
-            if (dto.SupplierId.HasValue)
-                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
-
-            if (dto.OrgId.HasValue)
-                query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
-
-            if (!string.IsNullOrEmpty(dto.StockCode))
-            {
-                var splitStrs = dto.StockCode.Split("_$");
-                query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]);
-            }
-
-            if (dto.Type.HasValue)
-                query = query.Where(w => (int)w.order.Type == dto.Type.Value);
-
-            if (dto.Status.HasValue)
-                query = query.Where(w => (int)w.order.Status == dto.Status.Value);
-
-            if (dto.CreateBeginDate != null)
-                query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date >= dto.CreateBeginDate.Value);
-            if (dto.CreateEndDate != null)
-                query = query.Where(w =>w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date <= dto.CreateEndDate.Value);
-
-
-            int total = await query.CountAsync();
-            var list = await query.Select(s => new InStockTaskQueryResponse()
-            {
-                Id = s.order.Id,
-                DetailsId = s.detail.Id,
-                BillNo = s.order.BillNo,
-                Type = s.order.Type.GetRemark(),
-                Status = s.order.Status.GetRemark(),
-                SourceBillNo = s.order.SourceBillNo,
-                Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
-                Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
-                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
-                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
-                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
-                FactoryPrice = s.detail.FactoryPrice,
-                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
-                AccruedQty = s.detail.AccruedQty,
-                ReceiveQty = s.detail.ReceiveQty,
-                RealityQty = s.detail.RealityQty,
-                Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "",
-                ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
-                ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
-                Remark=s.detail.Remark,
-            }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
-
-            return (list, total);
-        }
-
         /// <summary>
         /// 详情
         /// </summary>
@@ -530,5 +419,116 @@ namespace WMS.Web.Repositories
         {
             return await GetPagedList(dto);
         }
+
+        /// <summary>
+        /// 列表-分页
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<(List<InStockTaskQueryResponse> list, int total)> GetPagedList(InStockTaskQueryRequest dto)
+        {
+            //1.获取物料集合和组织集合
+            var materials_result = await _erpService.BillQueryForMaterial();
+            if (!materials_result.IsSuccess)
+                return (new List<InStockTaskQueryResponse>(), 0);
+            var materials = materials_result.Data.ToList();
+            //组织集合
+            var orgs_result = await _erpService.BillQueryForOrg();
+            if (!orgs_result.IsSuccess)
+                return (new List<InStockTaskQueryResponse>(), 0);
+            var orgs = orgs_result.Data.ToList();
+
+            //供应商集合
+            var suppliers_result = await _erpService.BillQueryForSupplier();
+            if (!suppliers_result.IsSuccess)
+                return (new List<InStockTaskQueryResponse>(), 0);
+            var suppliers = suppliers_result.Data.ToList();
+
+            List<int> ids_Receiver = new List<int>();
+            List<int> ids_Operator = new List<int>();
+            if (!string.IsNullOrEmpty(dto.Receiver) || !string.IsNullOrEmpty(dto.Operator))
+            {
+                var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
+                ids_Receiver = staffList.Where(w => w.Name.Contains(dto.Receiver)).Select(s => s.Id).ToList();
+                ids_Operator = staffList.Where(w => w.Name.Contains(dto.Operator)).Select(s => s.Id).ToList();
+            }
+
+            //物料集合；模糊查询后的物料集合
+            if (!string.IsNullOrEmpty(dto.MaterialNumber))
+                materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
+
+            var query = _context.InStockTaskDetails
+                .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
+                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                .Where(adv => 1 == 1);
+
+            if (!string.IsNullOrEmpty(dto.SourceBillNo))
+                query = query.Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + dto.SourceBillNo + "%"));
+
+            //物料ID在模糊后的物料
+            if (materials != null && materials.Count != 0 && !string.IsNullOrEmpty(dto.MaterialNumber))
+            {
+                var mids = materials.Select(x => x.MaterialId).ToList();
+                query = query.Where(w => mids.Contains(w.detail.MaterialId));
+            }
+
+            if (ids_Receiver.Count() > 0)
+                query = query.Where(w => ids_Receiver.Contains(w.order.ReceiverId ?? 0));
+            if (ids_Operator.Count() > 0)
+                query = query.Where(w => ids_Operator.Contains(w.order.ShelferId ?? 0));
+
+            if (dto.SupplierId.HasValue)
+                query = query.Where(w => w.detail.SupplierId == dto.SupplierId.Value);
+
+            if (dto.OrgId.HasValue)
+                query = query.Where(w => w.detail.OrgId == dto.OrgId.Value);
+
+            if (!string.IsNullOrEmpty(dto.StockCode))
+            {
+                var splitStrs = dto.StockCode.Split("_$");
+                query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]);
+            }
+
+            if (dto.Type.HasValue)
+                query = query.Where(w => (int)w.order.Type == dto.Type.Value);
+
+            if (dto.Status.HasValue)
+                query = query.Where(w => (int)w.order.Status == dto.Status.Value);
+
+            if (dto.CreateBeginDate != null)
+                query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date >= dto.CreateBeginDate.Value);
+            if (dto.CreateEndDate != null)
+                query = query.Where(w => w.order.ShelfTime.HasValue && w.order.ShelfTime.Value.Date <= dto.CreateEndDate.Value);
+
+
+            int total = await query.CountAsync();
+            var list = await query.Select(s => new InStockTaskQueryResponse()
+            {
+                Id = s.order.Id,
+                DetailsId = s.detail.Id,
+                BillNo = s.order.BillNo,
+                Type = s.order.Type.GetRemark(),
+                Status = s.order.Status.GetRemark(),
+                SourceBillNo = s.order.SourceBillNo,
+                Supplier = _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
+                Org = _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
+                MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
+                MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
+                Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
+                FactoryPrice = s.detail.FactoryPrice,
+                Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
+                AccruedQty = s.detail.AccruedQty,
+                ReceiveQty = s.detail.ReceiveQty,
+                RealityQty = s.detail.RealityQty,
+                Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "",
+                ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "",
+                ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                Remark = s.detail.Remark,
+            }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
+
+            return (list, total);
+        }
     }
 }