diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 7e18e7bc..e795baae 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2821,6 +2821,11 @@ 序列号集 + + + 组织 + + 物料库存数量 diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs index 37a1f227..f0ef0c97 100644 --- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs @@ -47,6 +47,11 @@ namespace WMS.Web.Core.Dto.Inventory /// 序列号集 /// public string SerialNumbers { get; set; } + + /// + /// 组织 + /// + public string Org { get; set; } /// /// 物料库存数量 /// diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs index 8ad4f09b..f6b1d8ca 100644 --- a/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs @@ -63,6 +63,6 @@ namespace WMS.Web.Core.Dto.Inventory /// /// 创建日期 /// - public DateTime CreateTime { get; set; } + public string CreateTime { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index 5de71327..a5642d1d 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -41,7 +41,7 @@ namespace WMS.Web.Domain.Entitys /// /// 同步成功或者失败 /// - public bool? SuccessSync { get; set; } + public int? SuccessSync { get; set; } /// /// 操作人 diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index f3e9e677..3867bcea 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -64,6 +64,12 @@ namespace WMS.Web.Repositories if (!string.IsNullOrEmpty(dto.MaterialNumber)) materials = materials.Where(w => w.MaterialNumber.Contains(dto.MaterialNumber)).ToList(); + //组织集合 + var orgs_result = await _erpService.BillQueryForOrg(); + if (!orgs_result.IsSuccess) + return (new List(), 0); + var orgs = orgs_result.Data.ToList(); + var query = _context.BoxInventoryDetails .GroupJoin(_context.BoxInventory, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) @@ -99,6 +105,8 @@ namespace WMS.Web.Repositories Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId), + SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','), + Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), Qty = s.detail.Qty, }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); return (list,total); diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs index 09fafe3b..0e25615c 100644 --- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs @@ -106,7 +106,7 @@ namespace WMS.Web.Repositories Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode), Qty = s.Qty, SurplusQty=s.SurplusQty, - CreateTime = s.CreateTime + CreateTime = s.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); return (list,total);