Add WmsLite monorepo with JWT auth, tenant context, and project READMEs.
Implement API security baseline (sys_user, JWT, audit fields, transactions, unique constraints) and Web real login with 401 handling. Document setup and development workflows in root, WmsLite.Api, and WmsLite.Web README files. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
commit
fa1b286463
241 files changed
+31188
No files matched your search
@@ -0,0 +1,84 @@
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Area;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class AreaRepository : BaseRepository<Area>, IAreaRepository
|
||||
{
|
||||
public AreaRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Area?> GetByWarehouseAndAreaCodeAsync(string tenantId, string ownerCode, string warehouseCode, string areaCode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(warehouseCode) || string.IsNullOrWhiteSpace(areaCode))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var w = warehouseCode.Trim();
|
||||
var a = areaCode.Trim();
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Area>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.WarehouseCode == w && x.Code == a)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, string>> GetNameMapByWarehouseCodesAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
IEnumerable<string> warehouseCodes)
|
||||
{
|
||||
var whList = warehouseCodes.Where(c => !string.IsNullOrWhiteSpace(c)).Select(c => c.Trim()).Distinct().ToList();
|
||||
if (whList.Count == 0)
|
||||
{
|
||||
return new Dictionary<string, string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var rows = await Db.Queryable<Area>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && whList.Contains(x.WarehouseCode))
|
||||
.Select(x => new { x.WarehouseCode, x.Code, x.Name })
|
||||
.ToListAsync();
|
||||
return rows.ToDictionary(
|
||||
x => $"{x.WarehouseCode}\0{x.Code}",
|
||||
x => x.Name?.Trim() ?? string.Empty,
|
||||
StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Area>> GetPagedListAsync(AreaPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var kw = query.Keyword?.Trim();
|
||||
var dbQuery = Db.Queryable<Area>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.WarehouseCode), x => x.WarehouseCode == query.WarehouseCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), x => x.Name.Contains(query.Name!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(kw), x => x.Code.Contains(kw!) || x.Name.Contains(kw!));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Area>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Common;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity : BaseEntity, new()
|
||||
{
|
||||
protected readonly ISqlSugarClient Db;
|
||||
private readonly ICurrentUserContext _userContext;
|
||||
|
||||
public BaseRepository(ISqlSugarClient db, ICurrentUserContext userContext)
|
||||
{
|
||||
Db = db;
|
||||
_userContext = userContext;
|
||||
}
|
||||
|
||||
public virtual async Task<TEntity?> GetByIdAsync(long id)
|
||||
{
|
||||
return await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted && x.Id == id)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<TEntity?> GetByIdAsync(long id, string tenantId, string ownerCode)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted && x.Id == id && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> predicate)
|
||||
{
|
||||
return await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted)
|
||||
.Where(predicate)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<PagedResult<TEntity>> GetPagedListAsync(BasePagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<TEntity>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
|
||||
public virtual async Task<long> InsertAsync(TEntity entity)
|
||||
{
|
||||
entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id;
|
||||
entity.CreateTime ??= DateTime.Now;
|
||||
entity.IsDeleted = false;
|
||||
if (_userContext.IsAuthenticated)
|
||||
{
|
||||
entity.CreateBy = _userContext.UserId;
|
||||
}
|
||||
|
||||
await Db.Insertable(entity).ExecuteCommandAsync();
|
||||
return entity.Id;
|
||||
}
|
||||
|
||||
public virtual async Task<int> UpdateAsync(TEntity entity)
|
||||
{
|
||||
entity.UpdateTime = DateTime.Now;
|
||||
if (_userContext.IsAuthenticated)
|
||||
{
|
||||
entity.UpdateBy = _userContext.UserId;
|
||||
}
|
||||
|
||||
return await Db.Updateable(entity).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<int> SoftDeleteAsync(long id)
|
||||
{
|
||||
if (_userContext.IsAuthenticated)
|
||||
{
|
||||
var uid = _userContext.UserId;
|
||||
return await Db.Updateable<TEntity>()
|
||||
.SetColumns(x => x.IsDeleted == true)
|
||||
.SetColumns(x => x.UpdateTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteBy == uid)
|
||||
.Where(x => x.Id == id)
|
||||
.ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
return await Db.Updateable<TEntity>()
|
||||
.SetColumns(x => x.IsDeleted == true)
|
||||
.SetColumns(x => x.UpdateTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteTime == DateTime.Now)
|
||||
.Where(x => x.Id == id)
|
||||
.ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<int> SoftDeleteAsync(long id, string tenantId, string ownerCode)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
if (_userContext.IsAuthenticated)
|
||||
{
|
||||
var uid = _userContext.UserId;
|
||||
return await Db.Updateable<TEntity>()
|
||||
.SetColumns(x => x.IsDeleted == true)
|
||||
.SetColumns(x => x.UpdateTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteBy == uid)
|
||||
.Where(x => x.Id == id && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
return await Db.Updateable<TEntity>()
|
||||
.SetColumns(x => x.IsDeleted == true)
|
||||
.SetColumns(x => x.UpdateTime == DateTime.Now)
|
||||
.SetColumns(x => x.DeleteTime == DateTime.Now)
|
||||
.Where(x => x.Id == id && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.ExecuteCommandAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Container;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class ContainerRepository : BaseRepository<Container>, IContainerRepository
|
||||
{
|
||||
public ContainerRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Container?> GetByCodeAsync(string tenantId, string ownerCode, string code)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(code))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Container>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.Code == code.Trim())
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Container>> GetPagedListAsync(ContainerPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
var kw = query.Keyword?.Trim();
|
||||
|
||||
var dbQuery = Db.Queryable<Container>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(
|
||||
!string.IsNullOrWhiteSpace(kw),
|
||||
x =>
|
||||
x.Code.Contains(kw!) ||
|
||||
(x.Name != null && x.Name.Contains(kw!)))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), x => x.Name != null && x.Name.Contains(query.Name!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.ContainerType),
|
||||
x => x.ContainerType != null && x.ContainerType.Contains(query.ContainerType!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Container>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class HttpAccessLogRepository : IHttpAccessLogRepository
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
|
||||
public HttpAccessLogRepository(ISqlSugarClient db)
|
||||
{
|
||||
_db = db;
|
||||
}
|
||||
|
||||
public async Task<long> InsertAsync(HttpAccessLog entity)
|
||||
{
|
||||
entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id;
|
||||
entity.CreateTime ??= DateTime.Now;
|
||||
await _db.Insertable(entity).ExecuteCommandAsync();
|
||||
return entity.Id;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Area;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IAreaRepository : IBaseRepository<Area>
|
||||
{
|
||||
Task<Area?> GetByWarehouseAndAreaCodeAsync(string tenantId, string ownerCode, string warehouseCode, string areaCode);
|
||||
|
||||
Task<Dictionary<string, string>> GetNameMapByWarehouseCodesAsync(string tenantId, string ownerCode, IEnumerable<string> warehouseCodes);
|
||||
|
||||
Task<PagedResult<Area>> GetPagedListAsync(AreaPagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Common;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IBaseRepository<TEntity> where TEntity : BaseEntity, new()
|
||||
{
|
||||
Task<TEntity?> GetByIdAsync(long id);
|
||||
|
||||
Task<TEntity?> GetByIdAsync(long id, string tenantId, string ownerCode);
|
||||
|
||||
Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> predicate);
|
||||
|
||||
Task<PagedResult<TEntity>> GetPagedListAsync(BasePagedQuery query);
|
||||
|
||||
Task<long> InsertAsync(TEntity entity);
|
||||
|
||||
Task<int> UpdateAsync(TEntity entity);
|
||||
|
||||
Task<int> SoftDeleteAsync(long id);
|
||||
|
||||
Task<int> SoftDeleteAsync(long id, string tenantId, string ownerCode);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Container;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IContainerRepository : IBaseRepository<Container>
|
||||
{
|
||||
Task<Container?> GetByCodeAsync(string tenantId, string ownerCode, string code);
|
||||
|
||||
Task<PagedResult<Container>> GetPagedListAsync(ContainerPagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IHttpAccessLogRepository
|
||||
{
|
||||
Task<long> InsertAsync(HttpAccessLog entity);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Inventory;
|
||||
using WmsLite.Api.Enums;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IInventoryRepository : IBaseRepository<Inventory>
|
||||
{
|
||||
Task<PagedResult<Inventory>> GetPagedListAsync(InventoryPagedQuery query);
|
||||
|
||||
Task<Inventory?> GetByStockKeyAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
string locationCode,
|
||||
InventoryKind inventoryKind,
|
||||
string? materialCode,
|
||||
string? containerCode);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Inventory;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IInventoryTransactionRepository
|
||||
{
|
||||
Task<long> InsertAsync(InventoryTransaction entity);
|
||||
|
||||
Task<PagedResult<InventoryTransaction>> GetPagedListAsync(InventoryTransactionPagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Location;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface ILocationRepository : IBaseRepository<Location>
|
||||
{
|
||||
Task<Location?> GetByWarehouseAreaZoneAndLocationCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
string locationCode);
|
||||
|
||||
/// <summary>按仓+库区+库位编码解析;若存在多行则取分区编码最小的一条。</summary>
|
||||
Task<Location?> GetByWarehouseAreaAndLocationCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string locationCode);
|
||||
|
||||
Task<PagedResult<Location>> GetPagedListAsync(LocationPagedQuery query);
|
||||
Task<HashSet<string>> GetExistingCodesAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
IReadOnlyCollection<string> codes);
|
||||
|
||||
Task InsertManyAsync(IReadOnlyList<Location> entities);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Material;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IMaterialRepository : IBaseRepository<Material>
|
||||
{
|
||||
Task<Material?> GetByCodeAsync(string tenantId, string ownerCode, string code);
|
||||
|
||||
Task<Dictionary<string, string>> GetNameMapByCodesAsync(string tenantId, string ownerCode, IEnumerable<string> codes);
|
||||
|
||||
Task<PagedResult<Material>> GetPagedListAsync(MaterialPagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Orders;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IInboundOrderRepository : IBaseRepository<InboundOrder>
|
||||
{
|
||||
Task<InboundOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo);
|
||||
|
||||
Task<PagedResult<InboundOrder>> GetPagedListAsync(InboundOrderPagedQuery query);
|
||||
|
||||
/// <summary>
|
||||
/// 同一天、同一前缀下,符合「前缀+yyyyMMdd+5位数字」格式的最大流水号(无则返回 0)。用于生成 IN2026022312345。
|
||||
/// </summary>
|
||||
Task<int> GetMaxDailySequenceInboundAsync(string tenantId, string ownerCode, string orderPrefix, string dateYyyyMmDd);
|
||||
}
|
||||
|
||||
public interface IInboundOrderLineRepository : IBaseRepository<InboundOrderLine>
|
||||
{
|
||||
Task<List<InboundOrderLine>> GetByOrderIdAsync(long orderId);
|
||||
}
|
||||
|
||||
public interface IOutboundOrderRepository : IBaseRepository<OutboundOrder>
|
||||
{
|
||||
Task<OutboundOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo);
|
||||
|
||||
Task<PagedResult<OutboundOrder>> GetPagedListAsync(OutboundOrderPagedQuery query);
|
||||
}
|
||||
|
||||
public interface IOutboundOrderLineRepository : IBaseRepository<OutboundOrderLine>
|
||||
{
|
||||
Task<List<OutboundOrderLine>> GetByOrderIdAsync(long orderId);
|
||||
}
|
||||
|
||||
public interface ITransferOrderRepository : IBaseRepository<TransferOrder>
|
||||
{
|
||||
Task<TransferOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo);
|
||||
|
||||
Task<PagedResult<TransferOrder>> GetPagedListAsync(TransferOrderPagedQuery query);
|
||||
}
|
||||
|
||||
public interface ITransferOrderLineRepository : IBaseRepository<TransferOrderLine>
|
||||
{
|
||||
Task<List<TransferOrderLine>> GetByOrderIdAsync(long orderId);
|
||||
}
|
||||
|
||||
public interface IStocktakeOrderRepository : IBaseRepository<StocktakeOrder>
|
||||
{
|
||||
Task<StocktakeOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo);
|
||||
|
||||
Task<PagedResult<StocktakeOrder>> GetPagedListAsync(StocktakeOrderPagedQuery query);
|
||||
}
|
||||
|
||||
public interface IStocktakeOrderLineRepository : IBaseRepository<StocktakeOrderLine>
|
||||
{
|
||||
Task<List<StocktakeOrderLine>> GetByOrderIdAsync(long orderId);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
/// <summary>查询字典行(租户 + platform system 默认)。</summary>
|
||||
public interface ISysDictItemRepository
|
||||
{
|
||||
/// <summary>
|
||||
/// 读取当前租户 scope 以及 tenant_id="system", owner_code="system" 的启用字典项。
|
||||
/// 调用方自行合并优先级。
|
||||
/// </summary>
|
||||
Task<List<SysDictItem>> ListEnabledAsync(string tenantId, string ownerCode, IReadOnlyList<string>? categories);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Template;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface ISysTemplateRepository : IBaseRepository<SysTemplate>
|
||||
{
|
||||
Task<SysTemplate?> GetByBizTypeAsync(string tenantId, string ownerCode, string? bizType);
|
||||
|
||||
Task<PagedResult<SysTemplate>> GetPagedListAsync(SysTemplatePagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface ISysUserRepository
|
||||
{
|
||||
Task<SysUser?> GetByUsernameAsync(string tenantId, string ownerCode, string username);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Warehouse;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IWarehouseRepository : IBaseRepository<Warehouse>
|
||||
{
|
||||
Task<Warehouse?> GetByCodeAsync(string tenantId, string ownerCode, string code);
|
||||
|
||||
Task<Dictionary<string, string>> GetNameMapByCodesAsync(string tenantId, string ownerCode, IEnumerable<string> codes);
|
||||
|
||||
Task<PagedResult<Warehouse>> GetPagedListAsync(WarehousePagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System.Threading.Tasks;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Zone;
|
||||
using WmsLite.Api.Models;
|
||||
|
||||
namespace WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
public interface IZoneRepository : IBaseRepository<Zone>
|
||||
{
|
||||
Task<Zone?> GetByWarehouseAreaAndZoneCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode);
|
||||
|
||||
Task<Dictionary<string, string>> GetNameMapByWarehouseCodesAsync(string tenantId, string ownerCode, IEnumerable<string> warehouseCodes);
|
||||
|
||||
Task<PagedResult<Zone>> GetPagedListAsync(ZonePagedQuery query);
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Inventory;
|
||||
using WmsLite.Api.Enums;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class InventoryRepository : BaseRepository<Inventory>, IInventoryRepository
|
||||
{
|
||||
private static readonly Regex KeyRegex = new("^[a-z0-9_]+$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
||||
public InventoryRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Inventory>> GetPagedListAsync(InventoryPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var dbQuery = Db.Queryable<Inventory>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(query.InventoryKind.HasValue, x => x.InventoryKind == query.InventoryKind!.Value)
|
||||
.WhereIF(query.InventoryStatus.HasValue, x => x.InventoryStatus == query.InventoryStatus!.Value)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.WarehouseCode), x => x.WarehouseCode == query.WarehouseCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.AreaCode), x => x.AreaCode == query.AreaCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.ZoneCode), x => x.ZoneCode == query.ZoneCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.MaterialCode),
|
||||
x => x.MaterialCode != null && x.MaterialCode.Contains(query.MaterialCode!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.ContainerCode),
|
||||
x => x.ContainerCode != null && x.ContainerCode.Contains(query.ContainerCode!.Trim()));
|
||||
|
||||
if (query.SearchParam is { Count: > 0 })
|
||||
{
|
||||
foreach (var entry in query.SearchParam)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(entry.Key) || entry.Value is null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var key = entry.Key.Trim();
|
||||
if (!KeyRegex.IsMatch(key))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var paramName = $"p_{key}";
|
||||
dbQuery = dbQuery.Where(
|
||||
$"attrs->>'{key}' = @{paramName}",
|
||||
new[] { new SugarParameter(paramName, entry.Value?.ToString()) });
|
||||
}
|
||||
}
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Inventory>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<Inventory?> GetByStockKeyAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
string locationCode,
|
||||
InventoryKind inventoryKind,
|
||||
string? materialCode,
|
||||
string? containerCode)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var warehouse = warehouseCode.Trim();
|
||||
var area = areaCode.Trim();
|
||||
var zone = zoneCode.Trim();
|
||||
var location = locationCode.Trim();
|
||||
var material = string.IsNullOrWhiteSpace(materialCode) ? null : materialCode.Trim();
|
||||
var container = string.IsNullOrWhiteSpace(containerCode) ? null : containerCode.Trim();
|
||||
|
||||
return await Db.Queryable<Inventory>()
|
||||
.Where(x => !x.IsDeleted
|
||||
&& x.TenantId == tenant
|
||||
&& x.OwnerCode == owner
|
||||
&& x.WarehouseCode == warehouse
|
||||
&& x.AreaCode == area
|
||||
&& x.ZoneCode == zone
|
||||
&& x.LocationCode == location
|
||||
&& x.InventoryKind == inventoryKind)
|
||||
.WhereIF(inventoryKind == InventoryKind.Material, x => x.MaterialCode == material)
|
||||
.WhereIF(inventoryKind == InventoryKind.EmptyContainer, x => x.ContainerCode == container)
|
||||
.FirstAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Inventory;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class InventoryTransactionRepository : IInventoryTransactionRepository
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
|
||||
public InventoryTransactionRepository(ISqlSugarClient db)
|
||||
{
|
||||
_db = db;
|
||||
}
|
||||
|
||||
public async Task<long> InsertAsync(InventoryTransaction entity)
|
||||
{
|
||||
entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id;
|
||||
entity.CreateTime ??= DateTime.Now;
|
||||
entity.IsDeleted = false;
|
||||
await _db.Insertable(entity).ExecuteCommandAsync();
|
||||
return entity.Id;
|
||||
}
|
||||
|
||||
public async Task<PagedResult<InventoryTransaction>> GetPagedListAsync(InventoryTransactionPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenant = query.TenantId.Trim();
|
||||
var owner = query.OwnerCode.Trim();
|
||||
|
||||
var dbQuery = _db.Queryable<InventoryTransaction>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.WhereIF(query.InventoryId.HasValue, x => x.InventoryId == query.InventoryId!.Value)
|
||||
.WhereIF(query.MovementType.HasValue, x => x.MovementType == query.MovementType!.Value)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.BizNo), x => x.BizNo != null && x.BizNo.Contains(query.BizNo!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<InventoryTransaction>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,171 @@
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Location;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class LocationRepository : BaseRepository<Location>, ILocationRepository
|
||||
{
|
||||
public LocationRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Location?> GetByWarehouseAreaZoneAndLocationCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
string locationCode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(warehouseCode)
|
||||
|| string.IsNullOrWhiteSpace(areaCode)
|
||||
|| string.IsNullOrWhiteSpace(zoneCode)
|
||||
|| string.IsNullOrWhiteSpace(locationCode))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var w = warehouseCode.Trim();
|
||||
var a = areaCode.Trim();
|
||||
var z = zoneCode.Trim();
|
||||
var l = locationCode.Trim();
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Location>()
|
||||
.Where(x =>
|
||||
!x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.WarehouseCode == w
|
||||
&& x.AreaCode == a && x.ZoneCode == z && x.Code == l)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<Location?> GetByWarehouseAreaAndLocationCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string locationCode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(warehouseCode)
|
||||
|| string.IsNullOrWhiteSpace(areaCode)
|
||||
|| string.IsNullOrWhiteSpace(locationCode))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var w = warehouseCode.Trim();
|
||||
var a = areaCode.Trim();
|
||||
var l = locationCode.Trim();
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Location>()
|
||||
.Where(x =>
|
||||
!x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.WarehouseCode == w
|
||||
&& x.AreaCode == a && x.Code == l)
|
||||
.OrderBy(x => x.ZoneCode)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Location>> GetPagedListAsync(LocationPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var dbQuery = Db.Queryable<Location>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.WarehouseCode), x => x.WarehouseCode == query.WarehouseCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.AreaCode), x => x.AreaCode == query.AreaCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.ZoneCode), x => x.ZoneCode == query.ZoneCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.AisleCode), x => x.AisleCode == query.AisleCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name),
|
||||
x => x.Name != null && x.Name.Contains(query.Name!.Trim()))
|
||||
.WhereIF(query.LocationStatus.HasValue, x => x.LocationStatus == query.LocationStatus!.Value)
|
||||
.WhereIF(query.IsOuter.HasValue, x => x.IsOuter == query.IsOuter!.Value)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.ContainerCode),
|
||||
x => x.ContainerCode != null && x.ContainerCode.Contains(query.ContainerCode!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderBy(x => x.Id)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Location>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
|
||||
/// <returns>已存在于库内的编码。</returns>
|
||||
public async Task<HashSet<string>> GetExistingCodesAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode,
|
||||
IReadOnlyCollection<string> codes)
|
||||
{
|
||||
if (codes.Count == 0)
|
||||
{
|
||||
return new HashSet<string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var w = warehouseCode.Trim();
|
||||
var a = areaCode.Trim();
|
||||
var z = zoneCode.Trim();
|
||||
var list = codes
|
||||
.Where(static c => !string.IsNullOrWhiteSpace(c))
|
||||
.Select(static c => c.Trim())
|
||||
.Distinct()
|
||||
.ToList();
|
||||
if (list.Count == 0)
|
||||
{
|
||||
return new HashSet<string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var existing = await Db.Queryable<Location>()
|
||||
.Where(x =>
|
||||
!x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.WarehouseCode == w
|
||||
&& x.AreaCode == a && x.ZoneCode == z)
|
||||
.Where(x => list.Contains(x.Code))
|
||||
.Select(x => x.Code)
|
||||
.ToListAsync();
|
||||
|
||||
return existing.ToHashSet(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
/// <summary>批量插入。</summary>
|
||||
public async Task InsertManyAsync(IReadOnlyList<Location> entities)
|
||||
{
|
||||
if (entities.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var now = DateTime.Now;
|
||||
var list = new List<Location>(entities.Count);
|
||||
foreach (var entity in entities)
|
||||
{
|
||||
if (entity.Id == 0)
|
||||
{
|
||||
entity.Id = SnowFlakeSingle.Instance.NextId();
|
||||
}
|
||||
|
||||
entity.CreateTime ??= now;
|
||||
entity.IsDeleted = false;
|
||||
list.Add(entity);
|
||||
}
|
||||
|
||||
await Db.Insertable(list).ExecuteCommandAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Material;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class MaterialRepository : BaseRepository<Material>, IMaterialRepository
|
||||
{
|
||||
public MaterialRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Material?> GetByCodeAsync(string tenantId, string ownerCode, string code)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(code))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Material>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.Code == code.Trim())
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, string>> GetNameMapByCodesAsync(string tenantId, string ownerCode, IEnumerable<string> codes)
|
||||
{
|
||||
var list = codes.Where(c => !string.IsNullOrWhiteSpace(c)).Select(c => c.Trim()).Distinct().ToList();
|
||||
if (list.Count == 0)
|
||||
{
|
||||
return new Dictionary<string, string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var rows = await Db.Queryable<Material>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && list.Contains(x.Code))
|
||||
.Select(x => new { x.Code, x.Name })
|
||||
.ToListAsync();
|
||||
return rows.ToDictionary(x => x.Code, x => x.Name?.Trim() ?? string.Empty, StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Material>> GetPagedListAsync(MaterialPagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var kw = query.Keyword?.Trim();
|
||||
var dbQuery = Db.Queryable<Material>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(kw), x => x.Code.Contains(kw!) || x.Name.Contains(kw!))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), x => x.Name.Contains(query.Name!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Spec), x => x.Spec != null && x.Spec.Contains(query.Spec!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Material>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,211 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Orders;
|
||||
using WmsLite.Api.Enums;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public abstract class OrderRepositoryBase<TEntity, TQuery> : BaseRepository<TEntity>
|
||||
where TEntity : BaseEntity, new()
|
||||
where TQuery : OrderPagedQueryBase
|
||||
{
|
||||
protected OrderRepositoryBase(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
protected async Task<TEntity?> GetByOrderNoCoreAsync(string tenantId, string ownerCode, string orderNo)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(orderNo))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var order = orderNo.Trim();
|
||||
return await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.Where("order_no = @orderNo", new { orderNo = order })
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
protected async Task<PagedResult<TEntity>> GetPagedListCoreAsync(TQuery query)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(query);
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenant = (query.TenantId ?? string.Empty).Trim();
|
||||
var owner = (query.OwnerCode ?? string.Empty).Trim();
|
||||
|
||||
// 注意:WhereIF(condition, sql, anonymousObject) 会在 condition 为 false 时仍对参数表达式求值,
|
||||
// 因此不能在匿名对象里对可能为 null 的 query.OrderNo / query.BizType 直接调用 Trim()。
|
||||
var dbQuery = Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(query.OrderNo))
|
||||
{
|
||||
var pattern = $"%{query.OrderNo.Trim()}%";
|
||||
dbQuery = dbQuery.Where("order_no LIKE @orderNo", new { orderNo = pattern });
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(query.BizType))
|
||||
{
|
||||
var bizType = query.BizType!.Trim();
|
||||
dbQuery = dbQuery.Where("biz_type = @bizType", new { bizType });
|
||||
}
|
||||
|
||||
if (query.OrderStatus.HasValue)
|
||||
{
|
||||
var orderStatus = (int)query.OrderStatus.Value;
|
||||
dbQuery = dbQuery.Where("order_status = @orderStatus", new { orderStatus });
|
||||
}
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<TEntity>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class OrderLineRepositoryBase<TEntity> : BaseRepository<TEntity>
|
||||
where TEntity : BaseEntity, new()
|
||||
{
|
||||
protected OrderLineRepositoryBase(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
protected async Task<List<TEntity>> GetByOrderIdCoreAsync(long orderId)
|
||||
{
|
||||
return await Db.Queryable<TEntity>()
|
||||
.Where(x => !x.IsDeleted)
|
||||
.Where("order_id = @orderId", new { orderId })
|
||||
.OrderBy("line_no")
|
||||
.ToListAsync();
|
||||
}
|
||||
}
|
||||
|
||||
public class InboundOrderRepository : OrderRepositoryBase<InboundOrder, InboundOrderPagedQuery>, IInboundOrderRepository
|
||||
{
|
||||
public InboundOrderRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<InboundOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo) => GetByOrderNoCoreAsync(tenantId, ownerCode, orderNo);
|
||||
|
||||
public Task<PagedResult<InboundOrder>> GetPagedListAsync(InboundOrderPagedQuery query) => GetPagedListCoreAsync(query);
|
||||
|
||||
public async Task<int> GetMaxDailySequenceInboundAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string orderPrefix,
|
||||
string dateYyyyMmDd)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var prefix = orderPrefix.Trim();
|
||||
var datePart = dateYyyyMmDd.Trim();
|
||||
if (datePart.Length != 8 || prefix.Length == 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
var fullPrefix = $"{prefix}{datePart}";
|
||||
var expectedLength = fullPrefix.Length + 5;
|
||||
|
||||
var nos = await Db.Queryable<InboundOrder>()
|
||||
.Where(o => !o.IsDeleted && o.TenantId == tenant && o.OwnerCode == owner)
|
||||
.Where(o => o.OrderNo.StartsWith(fullPrefix))
|
||||
.Select(o => o.OrderNo)
|
||||
.ToListAsync();
|
||||
|
||||
var max = 0;
|
||||
foreach (var n in nos)
|
||||
{
|
||||
if (string.IsNullOrEmpty(n)
|
||||
|| n.Length != expectedLength
|
||||
|| !n.StartsWith(fullPrefix, StringComparison.Ordinal))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var tail = n.AsSpan(fullPrefix.Length);
|
||||
if (tail.Length == 5
|
||||
&& int.TryParse(tail, NumberStyles.None, CultureInfo.InvariantCulture, out var seq)
|
||||
&& seq > max)
|
||||
{
|
||||
max = seq;
|
||||
}
|
||||
}
|
||||
|
||||
return max;
|
||||
}
|
||||
}
|
||||
|
||||
public class InboundOrderLineRepository : OrderLineRepositoryBase<InboundOrderLine>, IInboundOrderLineRepository
|
||||
{
|
||||
public InboundOrderLineRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<List<InboundOrderLine>> GetByOrderIdAsync(long orderId) => GetByOrderIdCoreAsync(orderId);
|
||||
}
|
||||
|
||||
public class OutboundOrderRepository : OrderRepositoryBase<OutboundOrder, OutboundOrderPagedQuery>, IOutboundOrderRepository
|
||||
{
|
||||
public OutboundOrderRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<OutboundOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo) => GetByOrderNoCoreAsync(tenantId, ownerCode, orderNo);
|
||||
|
||||
public Task<PagedResult<OutboundOrder>> GetPagedListAsync(OutboundOrderPagedQuery query) => GetPagedListCoreAsync(query);
|
||||
}
|
||||
|
||||
public class OutboundOrderLineRepository : OrderLineRepositoryBase<OutboundOrderLine>, IOutboundOrderLineRepository
|
||||
{
|
||||
public OutboundOrderLineRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<List<OutboundOrderLine>> GetByOrderIdAsync(long orderId) => GetByOrderIdCoreAsync(orderId);
|
||||
}
|
||||
|
||||
public class TransferOrderRepository : OrderRepositoryBase<TransferOrder, TransferOrderPagedQuery>, ITransferOrderRepository
|
||||
{
|
||||
public TransferOrderRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<TransferOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo) => GetByOrderNoCoreAsync(tenantId, ownerCode, orderNo);
|
||||
|
||||
public Task<PagedResult<TransferOrder>> GetPagedListAsync(TransferOrderPagedQuery query) => GetPagedListCoreAsync(query);
|
||||
}
|
||||
|
||||
public class TransferOrderLineRepository : OrderLineRepositoryBase<TransferOrderLine>, ITransferOrderLineRepository
|
||||
{
|
||||
public TransferOrderLineRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<List<TransferOrderLine>> GetByOrderIdAsync(long orderId) => GetByOrderIdCoreAsync(orderId);
|
||||
}
|
||||
|
||||
public class StocktakeOrderRepository : OrderRepositoryBase<StocktakeOrder, StocktakeOrderPagedQuery>, IStocktakeOrderRepository
|
||||
{
|
||||
public StocktakeOrderRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<StocktakeOrder?> GetByOrderNoAsync(string tenantId, string ownerCode, string orderNo) => GetByOrderNoCoreAsync(tenantId, ownerCode, orderNo);
|
||||
|
||||
public Task<PagedResult<StocktakeOrder>> GetPagedListAsync(StocktakeOrderPagedQuery query) => GetPagedListCoreAsync(query);
|
||||
}
|
||||
|
||||
public class StocktakeOrderLineRepository : OrderLineRepositoryBase<StocktakeOrderLine>, IStocktakeOrderLineRepository
|
||||
{
|
||||
public StocktakeOrderLineRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext) { }
|
||||
|
||||
public Task<List<StocktakeOrderLine>> GetByOrderIdAsync(long orderId) => GetByOrderIdCoreAsync(orderId);
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class SysDictItemRepository : ISysDictItemRepository
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
|
||||
public SysDictItemRepository(ISqlSugarClient db)
|
||||
{
|
||||
_db = db;
|
||||
}
|
||||
|
||||
public async Task<List<SysDictItem>> ListEnabledAsync(string tenantId, string ownerCode, IReadOnlyList<string>? categories)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
|
||||
var q = _db.Queryable<SysDictItem>()
|
||||
.Where(x => !x.IsDeleted && x.IsEnabled &&
|
||||
((x.TenantId == tenant && x.OwnerCode == owner)
|
||||
|| (x.TenantId == "system" && x.OwnerCode == "system")));
|
||||
|
||||
if (categories is { Count: > 0 })
|
||||
{
|
||||
var set = categories.Select(c => c.Trim()).Where(c => c.Length > 0).Distinct().ToList();
|
||||
if (set.Count > 0)
|
||||
{
|
||||
q = q.Where(x => set.Contains(x.Category));
|
||||
}
|
||||
}
|
||||
|
||||
return await q.OrderBy(x => x.Category).OrderBy(x => x.SortOrder).OrderBy(x => x.Code).ToListAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Template;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class SysTemplateRepository : BaseRepository<SysTemplate>, ISysTemplateRepository
|
||||
{
|
||||
public SysTemplateRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<SysTemplate?> GetByBizTypeAsync(string tenantId, string ownerCode, string? bizType)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(bizType))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<SysTemplate>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.BizType == bizType.Trim())
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<PagedResult<SysTemplate>> GetPagedListAsync(SysTemplatePagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenant = query.TenantId.Trim();
|
||||
var owner = query.OwnerCode.Trim();
|
||||
|
||||
var dbQuery = Db.Queryable<SysTemplate>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.BizType), x => x.BizType.Contains(query.BizType!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.BizName), x => x.BizName.Contains(query.BizName!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<SysTemplate>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class SysUserRepository : ISysUserRepository
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
|
||||
public SysUserRepository(ISqlSugarClient db)
|
||||
{
|
||||
_db = db;
|
||||
}
|
||||
|
||||
public async Task<SysUser?> GetByUsernameAsync(string tenantId, string ownerCode, string username)
|
||||
{
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var user = username.Trim();
|
||||
return await _db.Queryable<SysUser>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.Username == user)
|
||||
.FirstAsync();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Warehouse;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class WarehouseRepository : BaseRepository<Warehouse>, IWarehouseRepository
|
||||
{
|
||||
public WarehouseRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Warehouse?> GetByCodeAsync(string tenantId, string ownerCode, string code)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(code))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Warehouse>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.Code == code.Trim())
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, string>> GetNameMapByCodesAsync(string tenantId, string ownerCode, IEnumerable<string> codes)
|
||||
{
|
||||
var list = codes.Where(c => !string.IsNullOrWhiteSpace(c)).Select(c => c.Trim()).Distinct().ToList();
|
||||
if (list.Count == 0)
|
||||
{
|
||||
return new Dictionary<string, string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var rows = await Db.Queryable<Warehouse>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && list.Contains(x.Code))
|
||||
.Select(x => new { x.Code, x.Name })
|
||||
.ToListAsync();
|
||||
return rows.ToDictionary(x => x.Code, x => x.Name?.Trim() ?? string.Empty, StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Warehouse>> GetPagedListAsync(WarehousePagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var kw = query.Keyword?.Trim();
|
||||
var dbQuery = Db.Queryable<Warehouse>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(kw), x => x.Code.Contains(kw!) || x.Name.Contains(kw!))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), x => x.Name.Contains(query.Name!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Warehouse>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
using System.Threading.Tasks;
|
||||
using SqlSugar;
|
||||
using WmsLite.Api.Common;
|
||||
using WmsLite.Api.Dtos.Zone;
|
||||
using WmsLite.Api.Infrastructure.Auth;
|
||||
using WmsLite.Api.Models;
|
||||
using WmsLite.Api.Repositories.Interfaces;
|
||||
|
||||
namespace WmsLite.Api.Repositories;
|
||||
|
||||
public class ZoneRepository : BaseRepository<Zone>, IZoneRepository
|
||||
{
|
||||
public ZoneRepository(ISqlSugarClient db, ICurrentUserContext userContext) : base(db, userContext)
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<Zone?> GetByWarehouseAreaAndZoneCodeAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
string warehouseCode,
|
||||
string areaCode,
|
||||
string zoneCode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(warehouseCode)
|
||||
|| string.IsNullOrWhiteSpace(areaCode)
|
||||
|| string.IsNullOrWhiteSpace(zoneCode))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var w = warehouseCode.Trim();
|
||||
var a = areaCode.Trim();
|
||||
var z = zoneCode.Trim();
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
return await Db.Queryable<Zone>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner
|
||||
&& x.WarehouseCode == w && x.AreaCode == a && x.Code == z)
|
||||
.FirstAsync();
|
||||
}
|
||||
|
||||
public async Task<Dictionary<string, string>> GetNameMapByWarehouseCodesAsync(
|
||||
string tenantId,
|
||||
string ownerCode,
|
||||
IEnumerable<string> warehouseCodes)
|
||||
{
|
||||
var whList = warehouseCodes.Where(c => !string.IsNullOrWhiteSpace(c)).Select(c => c.Trim()).Distinct().ToList();
|
||||
if (whList.Count == 0)
|
||||
{
|
||||
return new Dictionary<string, string>(StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
var tenant = tenantId.Trim();
|
||||
var owner = ownerCode.Trim();
|
||||
var rows = await Db.Queryable<Zone>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && whList.Contains(x.WarehouseCode))
|
||||
.Select(x => new { x.WarehouseCode, x.AreaCode, x.Code, x.Name })
|
||||
.ToListAsync();
|
||||
return rows.ToDictionary(
|
||||
x => $"{x.WarehouseCode}\0{x.AreaCode}\0{x.Code}",
|
||||
x => x.Name?.Trim() ?? string.Empty,
|
||||
StringComparer.Ordinal);
|
||||
}
|
||||
|
||||
public async Task<PagedResult<Zone>> GetPagedListAsync(ZonePagedQuery query)
|
||||
{
|
||||
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
|
||||
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
|
||||
var tenantId = query.TenantId.Trim();
|
||||
var ownerCode = query.OwnerCode.Trim();
|
||||
|
||||
var kw = query.Keyword?.Trim();
|
||||
var dbQuery = Db.Queryable<Zone>()
|
||||
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.WarehouseCode), x => x.WarehouseCode == query.WarehouseCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.AreaCode), x => x.AreaCode == query.AreaCode!.Trim())
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(kw), x => x.Code.Contains(kw!) || x.Name.Contains(kw!))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Code), x => x.Code.Contains(query.Code!.Trim()))
|
||||
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), x => x.Name.Contains(query.Name!.Trim()));
|
||||
|
||||
RefAsync<int> total = 0;
|
||||
var items = await dbQuery
|
||||
.OrderByDescending(x => x.UpdateTime)
|
||||
.OrderByDescending(x => x.CreateTime)
|
||||
.ToPageListAsync(pageIndex, pageSize, total);
|
||||
|
||||
return new PagedResult<Zone>
|
||||
{
|
||||
PageIndex = pageIndex,
|
||||
PageSize = pageSize,
|
||||
TotalCount = total,
|
||||
Items = items
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user