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-30 18:12:20 +08:00
parent 0fedf62c93
commit 3b8558b793
8 changed files with 333 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,101 @@
<member name="P:ERP.AccessResult.AccessToken">
<remarks/>
</member>
<member name="T:WMS.Web.Core.Dto.BackRecordQueryRequest">
<summary>
出入库回退-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.Creator">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.CreateBeginDate">
<summary>
操作时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryRequest.CreateEndDate">
<summary>
操作时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.BackRecordQueryResponse">
<summary>
出入库回退-查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.BoxBillNo">
<summary>
所属箱号ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Type">
<summary>
类型：1为入库回退下架，2为出库回退上架
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Creator">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.CreateTime">
<summary>
操作时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SubStock">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecordQueryResponse.SerialNumbers">
<summary>
序列号集
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest">
<summary>
改箱列表请求

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

@@ -915,6 +915,11 @@
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.TakeStock.GenerateNo">
<summary>
生成单据号
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.TakeStockDetails">
<summary>
wms盘点单明细
@@ -980,6 +985,18 @@
备注
</summary>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IBackRecordRepositories">
<summary>
出入库回退记录-仓储接口
</summary>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBackRecordRepositories.GetPagedList(WMS.Web.Core.Dto.BackRecordQueryRequest)">
<summary>
列表-分页
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IBasicsRepositories">
<summary>
基础数据

35
src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryRequest.cs Normal file
View File

@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 出入库回退-查询请求对象
/// </summary>
public class BackRecordQueryRequest: PaginationBaseRequestDto
{
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 仓位ID
/// </summary>
public int? SubStockId { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
public DateTime? CreateBeginDate { get; set; } = null;
/// <summary>
/// 操作时间
/// </summary>
public DateTime? CreateEndDate { get; set; } = null;
}
}

65
src/WMS.Web.Core/Dto/BackRecord/BackRecordQueryResponse.cs Normal file
View File

@@ -0,0 +1,65 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 出入库回退-查询响应对象
/// </summary>
public class BackRecordQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 明细ID
/// </summary>
public int DetailsId { get; set; }
/// <summary>
/// 所属箱号ID
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 类型：1为入库回退下架，2为出库回退上架
/// </summary>
public string Type { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
public DateTime CreateTime { 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 decimal Qty { get; set; }
/// <summary>
/// 仓位
/// </summary>
public string SubStock { get; set; }
/// <summary>
/// 序列号集
/// </summary>
public string SerialNumbers { get; set; }
}
}

22
src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Internal.Results;
namespace WMS.Web.Domain.Infrastructure
{
/// <summary>
/// 出入库回退记录-仓储接口
/// </summary>
public interface IBackRecordRepositories
{
/// <summary>
/// 列表-分页
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<ResultPagedList<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto);
}
}

92
src/WMS.Web.Repositories/BackRecordRepositories.cs Normal file
View File

@@ -0,0 +1,92 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
/// <summary>
/// 出入库回退记录-仓储
/// </summary>
public class BackRecordRepositories: IBackRecordRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
public BackRecordRepositories(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<BackRecordQueryResponse>> GetPagedList(BackRecordQueryRequest dto)
{
var query = _context.BackRecordDetails
.GroupJoin(_context.BackRecord, 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.BoxBillNo))
// query = query.Where(w => EF.Functions.Like(w.order.BoxBillNo, "%" + dto.BoxBillNo + "%"));
//if (!string.IsNullOrEmpty(dto.MaterialNumber))
// query = query.Where(w => EF.Functions.Like(w.detail.BillNo, "%" + dto.BillNo + "%"));
if (dto.SubStockId.HasValue)
query = query.Where(w => w.detail.SubStockId == dto.SubStockId.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 response = new ResultPagedList<BackRecordQueryResponse>();
int total = await query.CountAsync();
response.TotalCount = total;
var list = await query.Select(s => new BackRecordQueryResponse()
{
Id = s.order.Id,
DetailsId = s.detail.Id,
BoxBillNo = "",
Type = s.order.Type.GetRemark(),
Creator = "",
CreateTime =s.order.CreateTime,
MaterialName = "",
MaterialNumber = "",
Specifications = "",
Qty = s.detail.Qty,
SubStock = "",
SerialNumbers = s.detail.SerialNumbers
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
response.Data = list;
return response;
}
}
}

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

@@ -38,6 +38,8 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddTransient<IInStockRepositories, InStockRepositories>();
services.AddTransient<IInStockTaskRepositories, InStockTaskRepositories>();
services.AddTransient<IBackRecordRepositories, BackRecordRepositories>();
services.AddTransient<IChangeBoxRecordRepositories, ChangeBoxRecordRepositories>();
services.AddTransient<IMoveBoxRecordRepositories, MoveBoxRecordRepositories>();

6
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -29,7 +29,11 @@ namespace WMS.Web.Repositories
private readonly ISingleDataService _singleDataService;
public InStockRepositories(RepositoryDbContext context, IMapper mapper, ILoginRepositories loginRepositories, IServiceProvider serviceProvider, ISingleDataService singleDataService)
public InStockRepositories(RepositoryDbContext context,
IMapper mapper,
ILoginRepositories loginRepositories,
IServiceProvider serviceProvider,
ISingleDataService singleDataService)
{
_context = context;
_mapper = mapper;