18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

箱库存-列表接口

Browse Source
This commit is contained in:
tongfei
2023-10-31 15:05:24 +08:00
parent 68f70fa820
commit 1eafbc8503
9 changed files with 413 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/WMS.Web.Api/Controllers/InventoryController.cs
View File

@@ -22,14 +22,17 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IInventoryDetailsRepositories _inventoryDetailsRepositories;
private readonly IInventoryInOutDetailsRepositories _inventoryInOutDetailsRepositories;
private readonly IBoxInventoryRepositories _boxInventoryRepositories;
public InventoryController(ILoginService loginService,
IInventoryDetailsRepositories inventoryDetailsRepositories,
IInventoryInOutDetailsRepositories inventoryInOutDetailsRepositories)
IInventoryInOutDetailsRepositories inventoryInOutDetailsRepositories,
IBoxInventoryRepositories boxInventoryRepositories)
{
this._loginService = loginService;
this._inventoryDetailsRepositories = inventoryDetailsRepositories;
this._inventoryInOutDetailsRepositories = inventoryInOutDetailsRepositories;
this._boxInventoryRepositories = boxInventoryRepositories;
}
/// <summary>
@@ -63,5 +66,21 @@ namespace WMS.Web.Api.Controllers
var result = await _inventoryInOutDetailsRepositories.GetPagedList(dto);
return result;
}
/// <summary>
/// 列表-箱库存明细
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("GetListBox")]
public async Task<ResultPagedList<BoxInventoryQueryResponse>> GetPagedListBox([FromBody] BoxInventoryQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<BoxInventoryQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var result = await _boxInventoryRepositories.GetPagedList(dto);
return result;
}
}
}

7
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -113,6 +113,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InventoryController.GetPagedListBox(WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest)">
<summary>
列表-箱库存明细
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.LoginController">
<summary>
登录接口

80
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -840,6 +840,86 @@
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest">
<summary>
箱库存-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.SubStockId">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse">
<summary>
箱库存-查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Stock">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.SubStock">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.SerialNumbers">
<summary>
序列号集
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryResponse.Qty">
<summary>
物料库存数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest">
<summary>
即时库存明细-查询请求对象

28
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1036,6 +1036,34 @@
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories">
<summary>
箱库存-仓储接口
</summary>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest)">
<summary>
列表-查询
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.BoxInventory},System.Boolean)">
<summary>
批量添加
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBoxInventoryRepositories.UpdateRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.BoxInventory},System.Boolean)">
<summary>
批量修改
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IBoxRepositories">
<summary>
老ops箱信息

32
src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryRequest.cs Normal file
View File

@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 箱库存-查询请求对象
/// </summary>
public class BoxInventoryQueryRequest : PaginationBaseRequestDto
{
/// <summary>
/// 仓库ID
/// </summary>
public int? StockId { get; set; }
/// <summary>
/// 仓位
/// </summary>
public int? SubStockId { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 物料编码
///</summary>
public string MaterialNumber { get; set; }
}
}

55
src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryResponse.cs Normal file
View File

@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 箱库存-查询响应对象
/// </summary>
public class BoxInventoryQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 明细ID
/// </summary>
public int DetailsId { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 仓库
/// </summary>
public string Stock { get; set; }
/// <summary>
/// 仓位
/// </summary>
public string SubStock { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 序列号集
/// </summary>
public string SerialNumbers { get; set; }
/// <summary>
/// 物料库存数量
/// </summary>
public decimal Qty { get; set; }
}
}

38
src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs Normal file
View File

@@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.Infrastructure
{
/// <summary>
/// 箱库存-仓储接口
/// </summary>
public interface IBoxInventoryRepositories
{
/// <summary>
/// 列表-查询
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<ResultPagedList<BoxInventoryQueryResponse>> GetPagedList(BoxInventoryQueryRequest dto);
/// <summary>
/// 批量添加
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> AddRange(List<BoxInventory> entitys, bool isTransaction = true);
/// <summary>
/// 批量修改
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> UpdateRange(List<BoxInventory> entitys, bool isTransaction = true);
}
}

151
src/WMS.Web.Repositories/BoxInventoryRepositories.cs Normal file
View File

@@ -0,0 +1,151 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values.Single;
using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
/// <summary>
/// 箱库存-仓储
/// </summary>
public class BoxInventoryRepositories: IBoxInventoryRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
public BoxInventoryRepositories(RepositoryDbContext context,
IMapper mapper,
ILoginRepositories loginRepositories,
IServiceProvider serviceProvider,
ISingleDataService singleDataService)
{
_context = context;
_mapper = mapper;
_serviceProvider = serviceProvider;
_loginRepositories = loginRepositories;
_singleDataService = singleDataService;
}
/// <summary>
/// 列表-分页
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<ResultPagedList<BoxInventoryQueryResponse>> GetPagedList(BoxInventoryQueryRequest dto)
{
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 })
.GroupJoin(_context.Box, p => p.order.BoxId, t => t.Id, (p, ts) => new { p.detail,p.order, ts })
.SelectMany(x => x.ts.DefaultIfEmpty(), (p, box) => new { p.detail, p.order, box })
.Where(adv => 1 == 1);
if (!string.IsNullOrEmpty(dto.BoxBillNo))
query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%"));
//if (!string.IsNullOrEmpty(dto.MaterialNumber))
// query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
if (dto.StockId.HasValue)
query = query.Where(w => w.order.StockId == dto.StockId.Value);
if (dto.SubStockId.HasValue)
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
var response = new ResultPagedList<BoxInventoryQueryResponse>();
int total = await query.CountAsync();
response.TotalCount = total;
var list = await query.Select(s => new BoxInventoryQueryResponse()
{
Id = s.order.Id,
DetailsId = s.detail.Id,
BoxBillNo = s.box.BoxBillNo,
MaterialName = "",
MaterialNumber = "",
Specifications = "",
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockId),
SubStock="",
Qty = s.detail.Qty,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
response.Data = list;
return response;
}
/// <summary>
/// 批量添加
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<bool> AddRange(List<BoxInventory> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
try
{
if (entitys != null && entitys.Count != 0)
{
await _context.BoxInventory.AddRangeAsync(entitys);
await _context.SaveChangesAsync();
}
if (_transaction != null)
_transaction.Commit();
return true;
}
catch
{
if (_transaction != null)
_transaction.Rollback();
return false;
}
}
/// <summary>
/// 批量修改
/// </summary>
/// <param name="entitys"></param>
/// <returns></returns>
public async Task<bool> UpdateRange(List<BoxInventory> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
{
try
{
List<int> list = entitys.Select(s => s.Id).ToList();
var res = await _context.BoxInventory.Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.Map(entitys, res);
await _context.SaveChangesAsync();
if (_transaction != null)
_transaction.Commit();
}
catch (Exception ex)
{
if (_transaction != null)
_transaction.Rollback();
return false;
}
return true;
}
}
}
}

1
src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs
View File

@@ -42,6 +42,7 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddTransient<IBackRecordRepositories, BackRecordRepositories>();
services.AddTransient<IInventoryDetailsRepositories, InventoryDetailsRepositories>();
services.AddTransient<IInventoryInOutDetailsRepositories, InventoryInOutDetailsRepositories>();
services.AddTransient<IBoxInventoryRepositories, BoxInventoryRepositories>();