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 11:47:48 +08:00
parent 7fea13a6cd
commit bef578f398
13 changed files with 742 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -65,6 +65,15 @@ namespace WMS.Web.Api.Controllers
{ {
response.BackRecordType.Add(enumv.ToString(), enumv.GetRemark()); response.BackRecordType.Add(enumv.ToString(), enumv.GetRemark());
} }
foreach (InventoryInOutType enumv in Enum.GetValues(typeof(InventoryInOutType)))
{
response.InventoryInOutType.Add(enumv.ToString(), enumv.GetRemark());
}
foreach (OrderType enumv in Enum.GetValues(typeof(OrderType)))
{
response.OrderType.Add(enumv.ToString(), enumv.GetRemark());
}
//2 //2
//1 //1
return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response)); return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));

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

@@ -450,6 +450,16 @@
类型：1为入库回退下架，2为出库回退上架 类型：1为入库回退下架，2为出库回退上架
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.EnumStatusResponse.InventoryInOutType">
<summary>
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.EnumStatusResponse.OrderType">
<summary>
单据类型
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto"> <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
<summary> <summary>
ERP：单据查询-dto ERP：单据查询-dto
@@ -830,6 +840,161 @@
明细 明细
</summary> </summary>
</member> </member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest">
<summary>
即时库存明细-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest.Qty">
<summary>
库存量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse">
<summary>
即时库存明细-查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Stock">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.SubStock">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Qty">
<summary>
库存量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryResponse.Unit">
<summary>
单位
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest">
<summary>
物料收发明细-查询请求
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.OrderType">
<summary>
单据类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.CreateBeginDate">
<summary>
创建日期
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest.CreateEndDate">
<summary>
创建日期
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse">
<summary>
物料收发明细-查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Type">
<summary>
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Stock">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.OrderType">
<summary>
单据类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.OrderBillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.SurplusQty">
<summary>
结存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryResponse.CreateTime">
<summary>
创建日期
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token"> <member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">
<summary> <summary>
授权token -- 给前端用的验证token 授权token -- 给前端用的验证token

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

@@ -1119,6 +1119,54 @@
<param name="isTransaction"></param> <param name="isTransaction"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories">
<summary>
库存相关-仓储接口
</summary>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryDetailsQueryRequest)">
<summary>
列表-分页
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryDetails},System.Boolean)">
<summary>
批量添加
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryDetailsRepositories.UpdateRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryDetails},System.Boolean)">
<summary>
批量修改
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories">
<summary>
物料收发明细-仓储接口
</summary>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.GetPagedList(WMS.Web.Core.Dto.Inventory.InventoryInOutDetailsQueryRequest)">
<summary>
列表-分页
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInventoryInOutDetailsRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InventoryInOutDetails},System.Boolean)">
<summary>
批量添加
</summary>
<param name="entitys"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="P:WMS.Web.Domain.Infrastructure.ILoginRepositories.CompanyId"> <member name="P:WMS.Web.Domain.Infrastructure.ILoginRepositories.CompanyId">
<summary> <summary>
公司Id 公司Id

8
src/WMS.Web.Core/Dto/EnumStatusResponse.cs
View File

@@ -34,6 +34,14 @@ namespace WMS.Web.Core.Dto
/// 类型：1为入库回退下架，2为出库回退上架 /// 类型：1为入库回退下架，2为出库回退上架
/// </summary> /// </summary>
public Dictionary<string, string> BackRecordType { get; set; } = new Dictionary<string, string>(); public Dictionary<string, string> BackRecordType { get; set; } = new Dictionary<string, string>();
/// <summary>
/// 类型：1为入库，2为出库
/// </summary>
public Dictionary<string, string> InventoryInOutType { get; set; } = new Dictionary<string, string>();
/// <summary>
/// 单据类型
/// </summary>
public Dictionary<string, string> OrderType { get; set; } = new Dictionary<string, string>();

27
src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryRequest.cs Normal file
View File

@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 即时库存明细-查询请求对象
/// </summary>
public class InventoryDetailsQueryRequest : PaginationBaseRequestDto
{
/// <summary>
/// 仓库ID
/// </summary>
public int? StockId { get; set; }
/// <summary>
/// 物料编码
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 库存量
/// </summary>
public decimal? Qty { get; set; }
}
}

49
src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs Normal file
View File

@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 即时库存明细-查询响应对象
/// </summary>
public class InventoryDetailsQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { 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 Stock { get; set; }
/// <summary>
/// 仓位
/// </summary>
public string SubStock { get; set; }
/// <summary>
/// 库存量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; }
}
}

36
src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryRequest.cs Normal file
View File

@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 物料收发明细-查询请求
/// </summary>
public class InventoryInOutDetailsQueryRequest : PaginationBaseRequestDto
{
/// <summary>
/// 仓库ID
/// </summary>
public int? StockId { get; set; }
/// <summary>
/// 物料编码
///</summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 单据类型
/// </summary>
public int? OrderType { get; set; }
/// <summary>
/// 创建日期
/// </summary>
public DateTime? CreateBeginDate { get; set; } = null;
/// <summary>
/// 创建日期
/// </summary>
public DateTime? CreateEndDate { get; set; } = null;
}
}

63
src/WMS.Web.Core/Dto/Inventory/InventoryInOutDetailsQueryResponse.cs Normal file
View File

@@ -0,0 +1,63 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Inventory
{
/// <summary>
/// 物料收发明细-查询响应对象
/// </summary>
public class InventoryInOutDetailsQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 类型：1为入库，2为出库
/// </summary>
public string Type { get; set; }
/// <summary>
/// 仓库
/// </summary>
public string Stock { get; set; }
/// <summary>
/// 单据类型
/// </summary>
public string OrderType { get; set; }
/// <summary>
/// 单据编号
/// </summary>
public string OrderBillNo { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 结存
/// </summary>
public decimal SurplusQty { get; set; }
/// <summary>
/// 创建日期
/// </summary>
public DateTime CreateTime { get; set; }
}
}

39
src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs Normal file
View File

@@ -0,0 +1,39 @@
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 IInventoryDetailsRepositories
{
/// <summary>
/// 列表-分页
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<ResultPagedList<InventoryDetailsQueryResponse>> GetPagedList(InventoryDetailsQueryRequest dto);
/// <summary>
/// 批量添加
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> AddRange(List<InventoryDetails> entitys, bool isTransaction = true);
/// <summary>
/// 批量修改
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> UpdateRange(List<InventoryDetails> entitys, bool isTransaction = true);
}
}

31
src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs Normal file
View File

@@ -0,0 +1,31 @@
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 IInventoryInOutDetailsRepositories
{
/// <summary>
/// 列表-分页
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<ResultPagedList<InventoryInOutDetailsQueryResponse>> GetPagedList(InventoryInOutDetailsQueryRequest dto);
/// <summary>
/// 批量添加
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> AddRange(List<InventoryInOutDetails> entitys, bool isTransaction = true);
}
}

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

@@ -40,8 +40,12 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddTransient<IInStockRepositories, InStockRepositories>(); services.AddTransient<IInStockRepositories, InStockRepositories>();
services.AddTransient<IInStockTaskRepositories, InStockTaskRepositories>(); services.AddTransient<IInStockTaskRepositories, InStockTaskRepositories>();
services.AddTransient<IBackRecordRepositories, BackRecordRepositories>(); services.AddTransient<IBackRecordRepositories, BackRecordRepositories>();
services.AddTransient<IInventoryDetailsRepositories, InventoryDetailsRepositories>();
services.AddTransient<IInventoryInOutDetailsRepositories, InventoryInOutDetailsRepositories>();
services.AddTransient<IChangeBoxRecordRepositories, ChangeBoxRecordRepositories>(); services.AddTransient<IChangeBoxRecordRepositories, ChangeBoxRecordRepositories>();
services.AddTransient<IMoveBoxRecordRepositories, MoveBoxRecordRepositories>(); services.AddTransient<IMoveBoxRecordRepositories, MoveBoxRecordRepositories>();
services.AddTransient<IOutStockRepositories, OutStockRepositories>(); services.AddTransient<IOutStockRepositories, OutStockRepositories>();

142
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs Normal file
View File

@@ -0,0 +1,142 @@
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.Repositories.Configuration;
namespace WMS.Web.Repositories
{
/// <summary>
/// 库存相关-仓储
/// </summary>
public class InventoryDetailsRepositories: IInventoryDetailsRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
public InventoryDetailsRepositories(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<InventoryDetailsQueryResponse>> GetPagedList(InventoryDetailsQueryRequest dto)
{
var query = _context.InventoryDetails
.Where(adv => 1 == 1);
//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.StockId == dto.StockId.Value);
if (dto.Qty.HasValue)
query = query.Where(w => w.Qty == dto.Qty);
var response = new ResultPagedList<InventoryDetailsQueryResponse>();
int total = await query.CountAsync();
response.TotalCount = total;
var list = await query.Select(s => new InventoryDetailsQueryResponse()
{
Id=s.Id,
MaterialName = "",
MaterialNumber = "",
Specifications = "",
Stock = "",
Qty = s.Qty,
SubStock ="",
Unit = ""
}).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<InventoryDetails> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
try
{
if (entitys != null && entitys.Count != 0)
{
await _context.InventoryDetails.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<InventoryDetails> 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.InventoryDetails.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;
}
}
}
}

121
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs Normal file
View File

@@ -0,0 +1,121 @@
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;
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.Repositories.Configuration;
namespace WMS.Web.Repositories
{
/// <summary>
/// 物料收发明细-仓储
/// </summary>
public class InventoryInOutDetailsRepositories: IInventoryInOutDetailsRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly ILoginRepositories _loginRepositories;
private readonly RepositoryDbContext _context;
private readonly ISingleDataService _singleDataService;
public InventoryInOutDetailsRepositories(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<InventoryInOutDetailsQueryResponse>> GetPagedList(InventoryInOutDetailsQueryRequest dto)
{
var query = _context.InventoryInOutDetails
.Where(adv => 1 == 1);
//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.StockId == dto.StockId.Value);
if (dto.OrderType.HasValue)
query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.CreateTime >= dto.CreateBeginDate.Value);
if (dto.CreateEndDate != null)
query = query.Where(w => w.CreateTime <= dto.CreateEndDate.Value);
var response = new ResultPagedList<InventoryInOutDetailsQueryResponse>();
int total = await query.CountAsync();
response.TotalCount = total;
var list = await query.Select(s => new InventoryInOutDetailsQueryResponse()
{
Id = s.Id,
MaterialName = "",
MaterialNumber = "",
Specifications = "",
Type=s.Type.GetRemark(),
OrderType=s.OrderType.GetRemark(),
OrderBillNo=s.OrderBillNo,
Stock = "",
Qty = s.Qty,
SurplusQty=s.SurplusQty,
CreateTime = s.CreateTime
}).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<InventoryInOutDetails> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
try
{
if (entitys != null && entitys.Count != 0)
{
await _context.InventoryInOutDetails.AddRangeAsync(entitys);
await _context.SaveChangesAsync();
}
if (_transaction != null)
_transaction.Commit();
return true;
}
catch
{
if (_transaction != null)
_transaction.Rollback();
return false;
}
}
}
}