'respository'

This commit is contained in:
zhougf committed 2026-05-31 01:03:55 +08:00
1 parent fa1b286463
commit 38ecbf82e5
41 files changed
+67 -120

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Area; namespace WmsLite.Api.Dtos.Area;
public class AreaSaveRequest : TenantOwnerRequest public class AreaSaveRequest
{ {
[Required(ErrorMessage = "仓库编码不能为空。")] [Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)] [StringLength(64)]
+1 -1
View File
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Area; namespace WmsLite.Api.Dtos.Area;
public class AreaUpdateRequest : TenantOwnerRequest public class AreaUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
@@ -4,14 +4,6 @@ namespace WmsLite.Api.Dtos.Common;
public class BasePagedQuery public class BasePagedQuery
{ {
[Obsolete("Ignored; tenant is resolved from the authenticated user context.")]
[StringLength(64)]
public string TenantId { get; set; } = string.Empty;
[Obsolete("Ignored; owner is resolved from the authenticated user context.")]
[StringLength(64)]
public string OwnerCode { get; set; } = string.Empty;
[Range(1, int.MaxValue, ErrorMessage = "PageIndex must be greater than or equal to 1.")] [Range(1, int.MaxValue, ErrorMessage = "PageIndex must be greater than or equal to 1.")]
public int PageIndex { get; set; } = 1; public int PageIndex { get; set; } = 1;
@@ -1,14 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace WmsLite.Api.Dtos.Common;
public class TenantOwnerQuery
{
[Required(ErrorMessage = "TenantId is required.")]
[StringLength(64)]
public string TenantId { get; set; } = string.Empty;
[Required(ErrorMessage = "OwnerCode is required.")]
[StringLength(64)]
public string OwnerCode { get; set; } = string.Empty;
}
@@ -1,14 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace WmsLite.Api.Dtos.Common;
public abstract class TenantOwnerRequest
{
[Obsolete("Ignored; tenant is resolved from the authenticated user context.")]
[StringLength(64)]
public string TenantId { get; set; } = string.Empty;
[Obsolete("Ignored; owner is resolved from the authenticated user context.")]
[StringLength(64)]
public string OwnerCode { get; set; } = string.Empty;
}
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Container; namespace WmsLite.Api.Dtos.Container;
public class ContainerSaveRequest : TenantOwnerRequest public class ContainerSaveRequest
{ {
[Required(ErrorMessage = "容器编码不能为空。")] [Required(ErrorMessage = "容器编码不能为空。")]
[StringLength(64)] [StringLength(64)]
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Container; namespace WmsLite.Api.Dtos.Container;
public class ContainerUpdateRequest : TenantOwnerRequest public class ContainerUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
@@ -2,7 +2,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Dictionary; namespace WmsLite.Api.Dtos.Dictionary;
public class SysDictionaryMapRequest : TenantOwnerRequest public class SysDictionaryMapRequest
{ {
/// <summary>Optional filter; omit to return all merged categories visible to tenant.</summary> /// <summary>Optional filter; omit to return all merged categories visible to tenant.</summary>
public List<string>? Categories { get; set; } public List<string>? Categories { get; set; }
@@ -4,7 +4,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Inventory; namespace WmsLite.Api.Dtos.Inventory;
public class InventoryMoveRequest : TenantOwnerRequest public class InventoryMoveRequest
{ {
[Range(1, long.MaxValue)] [Range(1, long.MaxValue)]
public long InventoryId { get; set; } public long InventoryId { get; set; }
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Inventory; namespace WmsLite.Api.Dtos.Inventory;
public abstract class InventoryMutationRequestBase : TenantOwnerRequest, IValidatableObject public abstract class InventoryMutationRequestBase : IValidatableObject
{ {
[Required(ErrorMessage = "BizType is required.")] [Required(ErrorMessage = "BizType is required.")]
[StringLength(64)] [StringLength(64)]
@@ -4,7 +4,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location; namespace WmsLite.Api.Dtos.Location;
public class LocationBatchCreateRequest : TenantOwnerRequest public class LocationBatchCreateRequest
{ {
[Required(ErrorMessage = "仓库编码不能为空。")] [Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)] [StringLength(64)]
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location; namespace WmsLite.Api.Dtos.Location;
public class LocationSaveRequest : TenantOwnerRequest public class LocationSaveRequest
{ {
[Required(ErrorMessage = "仓库编码不能为空。")] [Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)] [StringLength(64)]
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location; namespace WmsLite.Api.Dtos.Location;
public class LocationUpdateRequest : TenantOwnerRequest public class LocationUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Material; namespace WmsLite.Api.Dtos.Material;
public class MaterialSaveRequest : TenantOwnerRequest public class MaterialSaveRequest
{ {
[Required(ErrorMessage = "物料编码不能为空。")] [Required(ErrorMessage = "物料编码不能为空。")]
[StringLength(64)] [StringLength(64)]
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Material; namespace WmsLite.Api.Dtos.Material;
public class MaterialUpdateRequest : TenantOwnerRequest public class MaterialUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
+8 -8
View File
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Orders; namespace WmsLite.Api.Dtos.Orders;
public abstract class OrderSaveRequestBase : TenantOwnerRequest public abstract class OrderSaveRequestBase
{ {
[Required] [Required]
[StringLength(128)] [StringLength(128)]
@@ -31,7 +31,7 @@ public abstract class OrderPagedQueryBase : BasePagedQuery
public OrderStatus? OrderStatus { get; set; } public OrderStatus? OrderStatus { get; set; }
} }
public class OrderActionRequest : TenantOwnerRequest public class OrderActionRequest
{ {
[Range(1, long.MaxValue)] [Range(1, long.MaxValue)]
public long Id { get; set; } public long Id { get; set; }
@@ -123,8 +123,8 @@ public class StocktakeOrderLineRequest : InventoryOrderLineRequest
public decimal CountedQty { get; set; } public decimal CountedQty { get; set; }
} }
/// <summary>入库单新建:单号后端生成,无单头扩展 JSON。</summary> /// <summary>?????????????????? JSON?</summary>
public class InboundOrderCreateRequest : TenantOwnerRequest public class InboundOrderCreateRequest
{ {
[StringLength(64)] [StringLength(64)]
public string? BizType { get; set; } public string? BizType { get; set; }
@@ -159,7 +159,7 @@ public class InboundOrderLineSaveRequest
public Dictionary<string, object>? Attrs { get; set; } public Dictionary<string, object>? Attrs { get; set; }
} }
public class InboundOrderLineConfirmRequest : TenantOwnerRequest public class InboundOrderLineConfirmRequest
{ {
[Required] [Required]
public string LineId { get; set; } = string.Empty; public string LineId { get; set; } = string.Empty;
@@ -171,11 +171,11 @@ public class InboundOrderLineConfirmRequest : TenantOwnerRequest
[Range(typeof(decimal), "0.000001", "9999999999999999")] [Range(typeof(decimal), "0.000001", "9999999999999999")]
public decimal Qty { get; set; } public decimal Qty { get; set; }
/// <summary>空容器行必填;物料行可选(绑定容器)。</summary> /// <summary>???????????????????</summary>
[StringLength(64)] [StringLength(64)]
public string? ContainerCode { get; set; } public string? ContainerCode { get; set; }
/// <summary>物料行可省略,以物料主数据单位写入库存;空容器行必填。</summary> /// <summary>???????????????????????????</summary>
[StringLength(32)] [StringLength(32)]
public string? Unit { get; set; } public string? Unit { get; set; }
} }
@@ -223,7 +223,7 @@ public class StocktakeOrderPagedQuery : OrderPagedQueryBase
public class OrderViewDto public class OrderViewDto
{ {
/// <summary>雪花主键,用字符串避免 JSON number + 前端精度丢失。</summary> /// <summary>??????????? JSON number + ???????</summary>
public string Id { get; set; } = string.Empty; public string Id { get; set; } = string.Empty;
public string TenantId { get; set; } = string.Empty; public string TenantId { get; set; } = string.Empty;
+1 -1
View File
@@ -12,7 +12,7 @@ public class SysTemplatePagedQuery : BasePagedQuery
public string? BizName { get; set; } public string? BizName { get; set; }
} }
public class SysTemplateSaveRequest : TenantOwnerRequest public class SysTemplateSaveRequest
{ {
[Required] [Required]
[StringLength(64)] [StringLength(64)]
@@ -4,13 +4,13 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Warehouse; namespace WmsLite.Api.Dtos.Warehouse;
public class WarehouseSaveRequest : TenantOwnerRequest public class WarehouseSaveRequest
{ {
[Required(ErrorMessage = "仓库编码不能为空。")] [Required(ErrorMessage = "ä»?åº?ç¼?ç �ä¸�è?½ä¸ºç©ºã??")]
[StringLength(64)] [StringLength(64)]
public string Code { get; set; } = string.Empty; public string Code { get; set; } = string.Empty;
[Required(ErrorMessage = "仓库名称不能为空。")] [Required(ErrorMessage = "ä»?åº?å��ç§°ä¸�è?½ä¸ºç©ºã??")]
[StringLength(256)] [StringLength(256)]
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Warehouse; namespace WmsLite.Api.Dtos.Warehouse;
public class WarehouseUpdateRequest : TenantOwnerRequest public class WarehouseUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
+1 -1
View File
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Zone; namespace WmsLite.Api.Dtos.Zone;
public class ZoneSaveRequest : TenantOwnerRequest public class ZoneSaveRequest
{ {
[Required(ErrorMessage = "仓库编码不能为空。")] [Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)] [StringLength(64)]
+1 -1
View File
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Zone; namespace WmsLite.Api.Dtos.Zone;
public class ZoneUpdateRequest : TenantOwnerRequest public class ZoneUpdateRequest
{ {
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")] [Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; } public long Id { get; set; }
+2 -2
View File
@@ -56,8 +56,8 @@ public class AreaRepository : BaseRepository<Area>, IAreaRepository
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim(); var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable<Area>() var dbQuery = Db.Queryable<Area>()
+16 -12
View File
@@ -14,14 +14,18 @@ namespace WmsLite.Api.Repositories;
public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity : BaseEntity, new() public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity : BaseEntity, new()
{ {
protected readonly ISqlSugarClient Db; protected readonly ISqlSugarClient Db;
private readonly ICurrentUserContext _userContext; protected readonly ICurrentUserContext UserContext;
public BaseRepository(ISqlSugarClient db, ICurrentUserContext userContext) public BaseRepository(ISqlSugarClient db, ICurrentUserContext userContext)
{ {
Db = db; Db = db;
_userContext = userContext; UserContext = userContext;
} }
protected string ScopeTenantId => UserContext.TenantId.Trim();
protected string ScopeOwnerCode => UserContext.OwnerCode.Trim();
public virtual async Task<TEntity?> GetByIdAsync(long id) public virtual async Task<TEntity?> GetByIdAsync(long id)
{ {
return await Db.Queryable<TEntity>() return await Db.Queryable<TEntity>()
@@ -50,8 +54,8 @@ public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity :
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
RefAsync<int> total = 0; RefAsync<int> total = 0;
var items = await Db.Queryable<TEntity>() var items = await Db.Queryable<TEntity>()
@@ -74,9 +78,9 @@ public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity :
entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id; entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id;
entity.CreateTime ??= DateTime.Now; entity.CreateTime ??= DateTime.Now;
entity.IsDeleted = false; entity.IsDeleted = false;
if (_userContext.IsAuthenticated) if (UserContext.IsAuthenticated)
{ {
entity.CreateBy = _userContext.UserId; entity.CreateBy = UserContext.UserId;
} }
await Db.Insertable(entity).ExecuteCommandAsync(); await Db.Insertable(entity).ExecuteCommandAsync();
@@ -86,9 +90,9 @@ public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity :
public virtual async Task<int> UpdateAsync(TEntity entity) public virtual async Task<int> UpdateAsync(TEntity entity)
{ {
entity.UpdateTime = DateTime.Now; entity.UpdateTime = DateTime.Now;
if (_userContext.IsAuthenticated) if (UserContext.IsAuthenticated)
{ {
entity.UpdateBy = _userContext.UserId; entity.UpdateBy = UserContext.UserId;
} }
return await Db.Updateable(entity).ExecuteCommandAsync(); return await Db.Updateable(entity).ExecuteCommandAsync();
@@ -96,9 +100,9 @@ public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity :
public virtual async Task<int> SoftDeleteAsync(long id) public virtual async Task<int> SoftDeleteAsync(long id)
{ {
if (_userContext.IsAuthenticated) if (UserContext.IsAuthenticated)
{ {
var uid = _userContext.UserId; var uid = UserContext.UserId;
return await Db.Updateable<TEntity>() return await Db.Updateable<TEntity>()
.SetColumns(x => x.IsDeleted == true) .SetColumns(x => x.IsDeleted == true)
.SetColumns(x => x.UpdateTime == DateTime.Now) .SetColumns(x => x.UpdateTime == DateTime.Now)
@@ -120,9 +124,9 @@ public class BaseRepository<TEntity> : IBaseRepository<TEntity> where TEntity :
{ {
var tenant = tenantId.Trim(); var tenant = tenantId.Trim();
var owner = ownerCode.Trim(); var owner = ownerCode.Trim();
if (_userContext.IsAuthenticated) if (UserContext.IsAuthenticated)
{ {
var uid = _userContext.UserId; var uid = UserContext.UserId;
return await Db.Updateable<TEntity>() return await Db.Updateable<TEntity>()
.SetColumns(x => x.IsDeleted == true) .SetColumns(x => x.IsDeleted == true)
.SetColumns(x => x.UpdateTime == DateTime.Now) .SetColumns(x => x.UpdateTime == DateTime.Now)
@@ -32,8 +32,8 @@ public class ContainerRepository : BaseRepository<Container>, IContainerReposito
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim(); var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable<Container>() var dbQuery = Db.Queryable<Container>()
@@ -22,8 +22,8 @@ public class InventoryRepository : BaseRepository<Inventory>, IInventoryReposito
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var dbQuery = Db.Queryable<Inventory>() var dbQuery = Db.Queryable<Inventory>()
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode) .Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using SqlSugar; using SqlSugar;
using WmsLite.Api.Common; using WmsLite.Api.Common;
using WmsLite.Api.Dtos.Inventory; using WmsLite.Api.Dtos.Inventory;
using WmsLite.Api.Infrastructure.Auth;
using WmsLite.Api.Models; using WmsLite.Api.Models;
using WmsLite.Api.Repositories.Interfaces; using WmsLite.Api.Repositories.Interfaces;
@@ -11,10 +12,12 @@ namespace WmsLite.Api.Repositories;
public class InventoryTransactionRepository : IInventoryTransactionRepository public class InventoryTransactionRepository : IInventoryTransactionRepository
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly ICurrentUserContext _userContext;
public InventoryTransactionRepository(ISqlSugarClient db) public InventoryTransactionRepository(ISqlSugarClient db, ICurrentUserContext userContext)
{ {
_db = db; _db = db;
_userContext = userContext;
} }
public async Task<long> InsertAsync(InventoryTransaction entity) public async Task<long> InsertAsync(InventoryTransaction entity)
@@ -30,8 +33,8 @@ public class InventoryTransactionRepository : IInventoryTransactionRepository
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenant = query.TenantId.Trim(); var tenant = _userContext.TenantId.Trim();
var owner = query.OwnerCode.Trim(); var owner = _userContext.OwnerCode.Trim();
var dbQuery = _db.Queryable<InventoryTransaction>() var dbQuery = _db.Queryable<InventoryTransaction>()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner) .Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
@@ -73,8 +73,8 @@ public class LocationRepository : BaseRepository<Location>, ILocationRepository
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var dbQuery = Db.Queryable<Location>() var dbQuery = Db.Queryable<Location>()
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode) .Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
@@ -49,8 +49,8 @@ public class MaterialRepository : BaseRepository<Material>, IMaterialRepository
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim(); var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable<Material>() var dbQuery = Db.Queryable<Material>()
@@ -41,8 +41,8 @@ public abstract class OrderRepositoryBase<TEntity, TQuery> : BaseRepository<TEnt
ArgumentNullException.ThrowIfNull(query); ArgumentNullException.ThrowIfNull(query);
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenant = (query.TenantId ?? string.Empty).Trim(); var tenant = ScopeTenantId;
var owner = (query.OwnerCode ?? string.Empty).Trim(); var owner = ScopeOwnerCode;
// 注意:WhereIF(condition, sql, anonymousObject) 会在 condition 为 false 时仍对参数表达式求值, // 注意:WhereIF(condition, sql, anonymousObject) 会在 condition 为 false 时仍对参数表达式求值,
// 因此不能在匿名对象里对可能为 null 的 query.OrderNo / query.BizType 直接调用 Trim()。 // 因此不能在匿名对象里对可能为 null 的 query.OrderNo / query.BizType 直接调用 Trim()。
@@ -32,8 +32,8 @@ public class SysTemplateRepository : BaseRepository<SysTemplate>, ISysTemplateRe
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenant = query.TenantId.Trim(); var tenant = ScopeTenantId;
var owner = query.OwnerCode.Trim(); var owner = ScopeOwnerCode;
var dbQuery = Db.Queryable<SysTemplate>() var dbQuery = Db.Queryable<SysTemplate>()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner) .Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
@@ -49,8 +49,8 @@ public class WarehouseRepository : BaseRepository<Warehouse>, IWarehouseReposito
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim(); var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable<Warehouse>() var dbQuery = Db.Queryable<Warehouse>()
+2 -2
View File
@@ -66,8 +66,8 @@ public class ZoneRepository : BaseRepository<Zone>, IZoneRepository
{ {
var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex; var pageIndex = query.PageIndex <= 0 ? 1 : query.PageIndex;
var pageSize = query.PageSize <= 0 ? 20 : query.PageSize; var pageSize = query.PageSize <= 0 ? 20 : query.PageSize;
var tenantId = query.TenantId.Trim(); var tenantId = ScopeTenantId;
var ownerCode = query.OwnerCode.Trim(); var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim(); var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable<Zone>() var dbQuery = Db.Queryable<Zone>()
-2
View File
@@ -26,8 +26,6 @@ public class AreaService : IAreaService
public async Task<PagedResult<AreaViewDto>> GetPagedListAsync(AreaPagedQuery query) public async Task<PagedResult<AreaViewDto>> GetPagedListAsync(AreaPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _areaRepository.GetPagedListAsync(query); var page = await _areaRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<AreaViewDto> return new PagedResult<AreaViewDto>
-2
View File
@@ -22,8 +22,6 @@ public class ContainerService : IContainerService
public async Task<PagedResult<ContainerViewDto>> GetPagedListAsync(ContainerPagedQuery query) public async Task<PagedResult<ContainerViewDto>> GetPagedListAsync(ContainerPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _containerRepository.GetPagedListAsync(query); var page = await _containerRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<ContainerViewDto> return new PagedResult<ContainerViewDto>
-2
View File
@@ -54,8 +54,6 @@ public class InventoryService : IInventoryService
public async Task<PagedResult<InventoryViewDto>> GetPagedListAsync(InventoryPagedQuery query) public async Task<PagedResult<InventoryViewDto>> GetPagedListAsync(InventoryPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var pageData = await _inventoryRepository.GetPagedListAsync(query); var pageData = await _inventoryRepository.GetPagedListAsync(query);
var template = await _templateFieldValidationService.ValidateSearchParamAsync( var template = await _templateFieldValidationService.ValidateSearchParamAsync(
_userContext.TenantId.Trim(), _userContext.TenantId.Trim(),
-2
View File
@@ -30,8 +30,6 @@ public class LocationService : ILocationService
public async Task<PagedResult<LocationViewDto>> GetPagedListAsync(LocationPagedQuery query) public async Task<PagedResult<LocationViewDto>> GetPagedListAsync(LocationPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _locationRepository.GetPagedListAsync(query); var page = await _locationRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<LocationViewDto> return new PagedResult<LocationViewDto>
-2
View File
@@ -22,8 +22,6 @@ public class MaterialService : IMaterialService
public async Task<PagedResult<MaterialViewDto>> GetPagedListAsync(MaterialPagedQuery query) public async Task<PagedResult<MaterialViewDto>> GetPagedListAsync(MaterialPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _materialRepository.GetPagedListAsync(query); var page = await _materialRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<MaterialViewDto> return new PagedResult<MaterialViewDto>
-8
View File
@@ -241,8 +241,6 @@ public class InboundOrderService : OrderServiceBase, IInboundOrderService
public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(InboundOrderPagedQuery query) public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(InboundOrderPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query); var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult<OrderViewDto> return new PagedResult<OrderViewDto>
{ {
@@ -593,8 +591,6 @@ public class OutboundOrderService : OrderServiceBase, IOutboundOrderService
public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(OutboundOrderPagedQuery query) public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(OutboundOrderPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query); var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult<OrderViewDto> return new PagedResult<OrderViewDto>
{ {
@@ -753,8 +749,6 @@ public class TransferOrderService : OrderServiceBase, ITransferOrderService
public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(TransferOrderPagedQuery query) public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(TransferOrderPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query); var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult<OrderViewDto> return new PagedResult<OrderViewDto>
{ {
@@ -930,8 +924,6 @@ public class StocktakeOrderService : OrderServiceBase, IStocktakeOrderService
public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(StocktakeOrderPagedQuery query) public async Task<PagedResult<OrderViewDto>> GetPagedListAsync(StocktakeOrderPagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query); var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult<OrderViewDto> return new PagedResult<OrderViewDto>
{ {
@@ -20,8 +20,6 @@ public class SysTemplateService : ISysTemplateService
public async Task<PagedResult<SysTemplateViewDto>> GetPagedListAsync(SysTemplatePagedQuery query) public async Task<PagedResult<SysTemplateViewDto>> GetPagedListAsync(SysTemplatePagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _repository.GetPagedListAsync(query); var page = await _repository.GetPagedListAsync(query);
return new PagedResult<SysTemplateViewDto> return new PagedResult<SysTemplateViewDto>
{ {
-2
View File
@@ -22,8 +22,6 @@ public class WarehouseService : IWarehouseService
public async Task<PagedResult<WarehouseViewDto>> GetPagedListAsync(WarehousePagedQuery query) public async Task<PagedResult<WarehouseViewDto>> GetPagedListAsync(WarehousePagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _warehouseRepository.GetPagedListAsync(query); var page = await _warehouseRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<WarehouseViewDto> return new PagedResult<WarehouseViewDto>
-2
View File
@@ -29,8 +29,6 @@ public class ZoneService : IZoneService
public async Task<PagedResult<ZoneViewDto>> GetPagedListAsync(ZonePagedQuery query) public async Task<PagedResult<ZoneViewDto>> GetPagedListAsync(ZonePagedQuery query)
{ {
query.TenantId = _userContext.TenantId.Trim();
query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _zoneRepository.GetPagedListAsync(query); var page = await _zoneRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView); var items = page.Items.ConvertAll(MapToView);
return new PagedResult<ZoneViewDto> return new PagedResult<ZoneViewDto>