diff --git a/WmsLite.Api/Dtos/Area/AreaSaveRequest.cs b/WmsLite.Api/Dtos/Area/AreaSaveRequest.cs
index e9873c8..bb8aed4 100644
--- a/WmsLite.Api/Dtos/Area/AreaSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Area/AreaSaveRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Area;
-public class AreaSaveRequest : TenantOwnerRequest
+public class AreaSaveRequest
{
[Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Area/AreaUpdateRequest.cs b/WmsLite.Api/Dtos/Area/AreaUpdateRequest.cs
index dc8da4a..100d11f 100644
--- a/WmsLite.Api/Dtos/Area/AreaUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Area/AreaUpdateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Area;
-public class AreaUpdateRequest : TenantOwnerRequest
+public class AreaUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Dtos/Common/BasePagedQuery.cs b/WmsLite.Api/Dtos/Common/BasePagedQuery.cs
index 0408d01..cc1a0ea 100644
--- a/WmsLite.Api/Dtos/Common/BasePagedQuery.cs
+++ b/WmsLite.Api/Dtos/Common/BasePagedQuery.cs
@@ -4,14 +4,6 @@ namespace WmsLite.Api.Dtos.Common;
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.")]
public int PageIndex { get; set; } = 1;
diff --git a/WmsLite.Api/Dtos/Common/TenantOwnerQuery.cs b/WmsLite.Api/Dtos/Common/TenantOwnerQuery.cs
deleted file mode 100644
index 59f77db..0000000
--- a/WmsLite.Api/Dtos/Common/TenantOwnerQuery.cs
+++ /dev/null
@@ -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;
-}
diff --git a/WmsLite.Api/Dtos/Common/TenantOwnerRequest.cs b/WmsLite.Api/Dtos/Common/TenantOwnerRequest.cs
deleted file mode 100644
index 83c6d92..0000000
--- a/WmsLite.Api/Dtos/Common/TenantOwnerRequest.cs
+++ /dev/null
@@ -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;
-}
diff --git a/WmsLite.Api/Dtos/Container/ContainerSaveRequest.cs b/WmsLite.Api/Dtos/Container/ContainerSaveRequest.cs
index fcfe4a0..81fd96c 100644
--- a/WmsLite.Api/Dtos/Container/ContainerSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Container/ContainerSaveRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Container;
-public class ContainerSaveRequest : TenantOwnerRequest
+public class ContainerSaveRequest
{
[Required(ErrorMessage = "容器编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Container/ContainerUpdateRequest.cs b/WmsLite.Api/Dtos/Container/ContainerUpdateRequest.cs
index 2e99048..4f7176c 100644
--- a/WmsLite.Api/Dtos/Container/ContainerUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Container/ContainerUpdateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Container;
-public class ContainerUpdateRequest : TenantOwnerRequest
+public class ContainerUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Dtos/Dictionary/SysDictionaryMapRequest.cs b/WmsLite.Api/Dtos/Dictionary/SysDictionaryMapRequest.cs
index c54c5ad..4ae7f2b 100644
--- a/WmsLite.Api/Dtos/Dictionary/SysDictionaryMapRequest.cs
+++ b/WmsLite.Api/Dtos/Dictionary/SysDictionaryMapRequest.cs
@@ -2,7 +2,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Dictionary;
-public class SysDictionaryMapRequest : TenantOwnerRequest
+public class SysDictionaryMapRequest
{
/// Optional filter; omit to return all merged categories visible to tenant.
public List? Categories { get; set; }
diff --git a/WmsLite.Api/Dtos/Inventory/InventoryMoveRequest.cs b/WmsLite.Api/Dtos/Inventory/InventoryMoveRequest.cs
index 07dcc2c..c8b2558 100644
--- a/WmsLite.Api/Dtos/Inventory/InventoryMoveRequest.cs
+++ b/WmsLite.Api/Dtos/Inventory/InventoryMoveRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Inventory;
-public class InventoryMoveRequest : TenantOwnerRequest
+public class InventoryMoveRequest
{
[Range(1, long.MaxValue)]
public long InventoryId { get; set; }
diff --git a/WmsLite.Api/Dtos/Inventory/InventoryMutationRequestBase.cs b/WmsLite.Api/Dtos/Inventory/InventoryMutationRequestBase.cs
index 3abfc89..eba7535 100644
--- a/WmsLite.Api/Dtos/Inventory/InventoryMutationRequestBase.cs
+++ b/WmsLite.Api/Dtos/Inventory/InventoryMutationRequestBase.cs
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Inventory;
-public abstract class InventoryMutationRequestBase : TenantOwnerRequest, IValidatableObject
+public abstract class InventoryMutationRequestBase : IValidatableObject
{
[Required(ErrorMessage = "BizType is required.")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Location/LocationBatchCreateRequest.cs b/WmsLite.Api/Dtos/Location/LocationBatchCreateRequest.cs
index fd9fbf1..9717a45 100644
--- a/WmsLite.Api/Dtos/Location/LocationBatchCreateRequest.cs
+++ b/WmsLite.Api/Dtos/Location/LocationBatchCreateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location;
-public class LocationBatchCreateRequest : TenantOwnerRequest
+public class LocationBatchCreateRequest
{
[Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Location/LocationSaveRequest.cs b/WmsLite.Api/Dtos/Location/LocationSaveRequest.cs
index 87d87ac..c762ae2 100644
--- a/WmsLite.Api/Dtos/Location/LocationSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Location/LocationSaveRequest.cs
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location;
-public class LocationSaveRequest : TenantOwnerRequest
+public class LocationSaveRequest
{
[Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Location/LocationUpdateRequest.cs b/WmsLite.Api/Dtos/Location/LocationUpdateRequest.cs
index 043479a..2a314e7 100644
--- a/WmsLite.Api/Dtos/Location/LocationUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Location/LocationUpdateRequest.cs
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Location;
-public class LocationUpdateRequest : TenantOwnerRequest
+public class LocationUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Dtos/Material/MaterialSaveRequest.cs b/WmsLite.Api/Dtos/Material/MaterialSaveRequest.cs
index 8e9d516..ceeb914 100644
--- a/WmsLite.Api/Dtos/Material/MaterialSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Material/MaterialSaveRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Material;
-public class MaterialSaveRequest : TenantOwnerRequest
+public class MaterialSaveRequest
{
[Required(ErrorMessage = "物料编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Material/MaterialUpdateRequest.cs b/WmsLite.Api/Dtos/Material/MaterialUpdateRequest.cs
index 55094a3..6ef0347 100644
--- a/WmsLite.Api/Dtos/Material/MaterialUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Material/MaterialUpdateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Material;
-public class MaterialUpdateRequest : TenantOwnerRequest
+public class MaterialUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Dtos/Orders/OrderDtos.cs b/WmsLite.Api/Dtos/Orders/OrderDtos.cs
index 9f80de3..525ca83 100644
--- a/WmsLite.Api/Dtos/Orders/OrderDtos.cs
+++ b/WmsLite.Api/Dtos/Orders/OrderDtos.cs
@@ -5,7 +5,7 @@ using WmsLite.Api.Enums;
namespace WmsLite.Api.Dtos.Orders;
-public abstract class OrderSaveRequestBase : TenantOwnerRequest
+public abstract class OrderSaveRequestBase
{
[Required]
[StringLength(128)]
@@ -31,7 +31,7 @@ public abstract class OrderPagedQueryBase : BasePagedQuery
public OrderStatus? OrderStatus { get; set; }
}
-public class OrderActionRequest : TenantOwnerRequest
+public class OrderActionRequest
{
[Range(1, long.MaxValue)]
public long Id { get; set; }
@@ -123,8 +123,8 @@ public class StocktakeOrderLineRequest : InventoryOrderLineRequest
public decimal CountedQty { get; set; }
}
-/// 入库单新建:单号后端生成,无单头扩展 JSON。
-public class InboundOrderCreateRequest : TenantOwnerRequest
+/// ?????????????????? JSON?
+public class InboundOrderCreateRequest
{
[StringLength(64)]
public string? BizType { get; set; }
@@ -159,7 +159,7 @@ public class InboundOrderLineSaveRequest
public Dictionary? Attrs { get; set; }
}
-public class InboundOrderLineConfirmRequest : TenantOwnerRequest
+public class InboundOrderLineConfirmRequest
{
[Required]
public string LineId { get; set; } = string.Empty;
@@ -171,11 +171,11 @@ public class InboundOrderLineConfirmRequest : TenantOwnerRequest
[Range(typeof(decimal), "0.000001", "9999999999999999")]
public decimal Qty { get; set; }
- /// 空容器行必填;物料行可选(绑定容器)。
+ /// ???????????????????
[StringLength(64)]
public string? ContainerCode { get; set; }
- /// 物料行可省略,以物料主数据单位写入库存;空容器行必填。
+ /// ???????????????????????????
[StringLength(32)]
public string? Unit { get; set; }
}
@@ -223,7 +223,7 @@ public class StocktakeOrderPagedQuery : OrderPagedQueryBase
public class OrderViewDto
{
- /// 雪花主键,用字符串避免 JSON number + 前端精度丢失。
+ /// ??????????? JSON number + ???????
public string Id { get; set; } = string.Empty;
public string TenantId { get; set; } = string.Empty;
diff --git a/WmsLite.Api/Dtos/Template/SysTemplateDtos.cs b/WmsLite.Api/Dtos/Template/SysTemplateDtos.cs
index 50686c6..f5ee5c2 100644
--- a/WmsLite.Api/Dtos/Template/SysTemplateDtos.cs
+++ b/WmsLite.Api/Dtos/Template/SysTemplateDtos.cs
@@ -12,7 +12,7 @@ public class SysTemplatePagedQuery : BasePagedQuery
public string? BizName { get; set; }
}
-public class SysTemplateSaveRequest : TenantOwnerRequest
+public class SysTemplateSaveRequest
{
[Required]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Warehouse/WarehouseSaveRequest.cs b/WmsLite.Api/Dtos/Warehouse/WarehouseSaveRequest.cs
index d3ef159..2f951e9 100644
--- a/WmsLite.Api/Dtos/Warehouse/WarehouseSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Warehouse/WarehouseSaveRequest.cs
@@ -4,13 +4,13 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Warehouse;
-public class WarehouseSaveRequest : TenantOwnerRequest
+public class WarehouseSaveRequest
{
- [Required(ErrorMessage = "仓库编码不能为空。")]
+ [Required(ErrorMessage = "ä»?åº?ç¼?码不è?½为空ã??")]
[StringLength(64)]
public string Code { get; set; } = string.Empty;
- [Required(ErrorMessage = "仓库名称不能为空。")]
+ [Required(ErrorMessage = "ä»?åº?名称不è?½为空ã??")]
[StringLength(256)]
public string Name { get; set; } = string.Empty;
diff --git a/WmsLite.Api/Dtos/Warehouse/WarehouseUpdateRequest.cs b/WmsLite.Api/Dtos/Warehouse/WarehouseUpdateRequest.cs
index da55cc2..bcc2f4a 100644
--- a/WmsLite.Api/Dtos/Warehouse/WarehouseUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Warehouse/WarehouseUpdateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Warehouse;
-public class WarehouseUpdateRequest : TenantOwnerRequest
+public class WarehouseUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Dtos/Zone/ZoneSaveRequest.cs b/WmsLite.Api/Dtos/Zone/ZoneSaveRequest.cs
index 7d861ea..8d85bd4 100644
--- a/WmsLite.Api/Dtos/Zone/ZoneSaveRequest.cs
+++ b/WmsLite.Api/Dtos/Zone/ZoneSaveRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Zone;
-public class ZoneSaveRequest : TenantOwnerRequest
+public class ZoneSaveRequest
{
[Required(ErrorMessage = "仓库编码不能为空。")]
[StringLength(64)]
diff --git a/WmsLite.Api/Dtos/Zone/ZoneUpdateRequest.cs b/WmsLite.Api/Dtos/Zone/ZoneUpdateRequest.cs
index 2024cc3..5e5f7c0 100644
--- a/WmsLite.Api/Dtos/Zone/ZoneUpdateRequest.cs
+++ b/WmsLite.Api/Dtos/Zone/ZoneUpdateRequest.cs
@@ -4,7 +4,7 @@ using WmsLite.Api.Dtos.Common;
namespace WmsLite.Api.Dtos.Zone;
-public class ZoneUpdateRequest : TenantOwnerRequest
+public class ZoneUpdateRequest
{
[Range(1, long.MaxValue, ErrorMessage = "Id 必须大于 0。")]
public long Id { get; set; }
diff --git a/WmsLite.Api/Repositories/AreaRepository.cs b/WmsLite.Api/Repositories/AreaRepository.cs
index 28c290e..9425d82 100644
--- a/WmsLite.Api/Repositories/AreaRepository.cs
+++ b/WmsLite.Api/Repositories/AreaRepository.cs
@@ -56,8 +56,8 @@ public class AreaRepository : BaseRepository, IAreaRepository
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable()
diff --git a/WmsLite.Api/Repositories/BaseRepository.cs b/WmsLite.Api/Repositories/BaseRepository.cs
index 23ae706..69a9ef5 100644
--- a/WmsLite.Api/Repositories/BaseRepository.cs
+++ b/WmsLite.Api/Repositories/BaseRepository.cs
@@ -14,14 +14,18 @@ namespace WmsLite.Api.Repositories;
public class BaseRepository : IBaseRepository where TEntity : BaseEntity, new()
{
protected readonly ISqlSugarClient Db;
- private readonly ICurrentUserContext _userContext;
+ protected readonly ICurrentUserContext UserContext;
public BaseRepository(ISqlSugarClient db, ICurrentUserContext userContext)
{
Db = db;
- _userContext = userContext;
+ UserContext = userContext;
}
+ protected string ScopeTenantId => UserContext.TenantId.Trim();
+
+ protected string ScopeOwnerCode => UserContext.OwnerCode.Trim();
+
public virtual async Task GetByIdAsync(long id)
{
return await Db.Queryable()
@@ -50,8 +54,8 @@ public class BaseRepository : IBaseRepository where TEntity :
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
RefAsync total = 0;
var items = await Db.Queryable()
@@ -74,9 +78,9 @@ public class BaseRepository : IBaseRepository where TEntity :
entity.Id = entity.Id == 0 ? SnowFlakeSingle.Instance.NextId() : entity.Id;
entity.CreateTime ??= DateTime.Now;
entity.IsDeleted = false;
- if (_userContext.IsAuthenticated)
+ if (UserContext.IsAuthenticated)
{
- entity.CreateBy = _userContext.UserId;
+ entity.CreateBy = UserContext.UserId;
}
await Db.Insertable(entity).ExecuteCommandAsync();
@@ -86,9 +90,9 @@ public class BaseRepository : IBaseRepository where TEntity :
public virtual async Task UpdateAsync(TEntity entity)
{
entity.UpdateTime = DateTime.Now;
- if (_userContext.IsAuthenticated)
+ if (UserContext.IsAuthenticated)
{
- entity.UpdateBy = _userContext.UserId;
+ entity.UpdateBy = UserContext.UserId;
}
return await Db.Updateable(entity).ExecuteCommandAsync();
@@ -96,9 +100,9 @@ public class BaseRepository : IBaseRepository where TEntity :
public virtual async Task SoftDeleteAsync(long id)
{
- if (_userContext.IsAuthenticated)
+ if (UserContext.IsAuthenticated)
{
- var uid = _userContext.UserId;
+ var uid = UserContext.UserId;
return await Db.Updateable()
.SetColumns(x => x.IsDeleted == true)
.SetColumns(x => x.UpdateTime == DateTime.Now)
@@ -120,9 +124,9 @@ public class BaseRepository : IBaseRepository where TEntity :
{
var tenant = tenantId.Trim();
var owner = ownerCode.Trim();
- if (_userContext.IsAuthenticated)
+ if (UserContext.IsAuthenticated)
{
- var uid = _userContext.UserId;
+ var uid = UserContext.UserId;
return await Db.Updateable()
.SetColumns(x => x.IsDeleted == true)
.SetColumns(x => x.UpdateTime == DateTime.Now)
diff --git a/WmsLite.Api/Repositories/ContainerRepository.cs b/WmsLite.Api/Repositories/ContainerRepository.cs
index 35bf501..422c441 100644
--- a/WmsLite.Api/Repositories/ContainerRepository.cs
+++ b/WmsLite.Api/Repositories/ContainerRepository.cs
@@ -32,8 +32,8 @@ public class ContainerRepository : BaseRepository, IContainerReposito
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable()
diff --git a/WmsLite.Api/Repositories/InventoryRepository.cs b/WmsLite.Api/Repositories/InventoryRepository.cs
index fbace7b..8855149 100644
--- a/WmsLite.Api/Repositories/InventoryRepository.cs
+++ b/WmsLite.Api/Repositories/InventoryRepository.cs
@@ -22,8 +22,8 @@ public class InventoryRepository : BaseRepository, IInventoryReposito
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var dbQuery = Db.Queryable()
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
diff --git a/WmsLite.Api/Repositories/InventoryTransactionRepository.cs b/WmsLite.Api/Repositories/InventoryTransactionRepository.cs
index a7e4005..93fa2cd 100644
--- a/WmsLite.Api/Repositories/InventoryTransactionRepository.cs
+++ b/WmsLite.Api/Repositories/InventoryTransactionRepository.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
using SqlSugar;
using WmsLite.Api.Common;
using WmsLite.Api.Dtos.Inventory;
+using WmsLite.Api.Infrastructure.Auth;
using WmsLite.Api.Models;
using WmsLite.Api.Repositories.Interfaces;
@@ -11,10 +12,12 @@ namespace WmsLite.Api.Repositories;
public class InventoryTransactionRepository : IInventoryTransactionRepository
{
private readonly ISqlSugarClient _db;
+ private readonly ICurrentUserContext _userContext;
- public InventoryTransactionRepository(ISqlSugarClient db)
+ public InventoryTransactionRepository(ISqlSugarClient db, ICurrentUserContext userContext)
{
_db = db;
+ _userContext = userContext;
}
public async Task InsertAsync(InventoryTransaction entity)
@@ -30,8 +33,8 @@ public class InventoryTransactionRepository : IInventoryTransactionRepository
{
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 tenant = _userContext.TenantId.Trim();
+ var owner = _userContext.OwnerCode.Trim();
var dbQuery = _db.Queryable()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
diff --git a/WmsLite.Api/Repositories/LocationRepository.cs b/WmsLite.Api/Repositories/LocationRepository.cs
index a29ba8c..07e563b 100644
--- a/WmsLite.Api/Repositories/LocationRepository.cs
+++ b/WmsLite.Api/Repositories/LocationRepository.cs
@@ -73,8 +73,8 @@ public class LocationRepository : BaseRepository, ILocationRepository
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var dbQuery = Db.Queryable()
.Where(x => !x.IsDeleted && x.TenantId == tenantId && x.OwnerCode == ownerCode)
diff --git a/WmsLite.Api/Repositories/MaterialRepository.cs b/WmsLite.Api/Repositories/MaterialRepository.cs
index fe0db67..b1cab05 100644
--- a/WmsLite.Api/Repositories/MaterialRepository.cs
+++ b/WmsLite.Api/Repositories/MaterialRepository.cs
@@ -49,8 +49,8 @@ public class MaterialRepository : BaseRepository, IMaterialRepository
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable()
diff --git a/WmsLite.Api/Repositories/OrderRepositories.cs b/WmsLite.Api/Repositories/OrderRepositories.cs
index 549d78e..efe97e7 100644
--- a/WmsLite.Api/Repositories/OrderRepositories.cs
+++ b/WmsLite.Api/Repositories/OrderRepositories.cs
@@ -41,8 +41,8 @@ public abstract class OrderRepositoryBase : BaseRepository, ISysTemplateRe
{
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 tenant = ScopeTenantId;
+ var owner = ScopeOwnerCode;
var dbQuery = Db.Queryable()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
diff --git a/WmsLite.Api/Repositories/WarehouseRepository.cs b/WmsLite.Api/Repositories/WarehouseRepository.cs
index 2ae7540..6d9e62d 100644
--- a/WmsLite.Api/Repositories/WarehouseRepository.cs
+++ b/WmsLite.Api/Repositories/WarehouseRepository.cs
@@ -49,8 +49,8 @@ public class WarehouseRepository : BaseRepository, IWarehouseReposito
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable()
diff --git a/WmsLite.Api/Repositories/ZoneRepository.cs b/WmsLite.Api/Repositories/ZoneRepository.cs
index d0f2d72..aba0555 100644
--- a/WmsLite.Api/Repositories/ZoneRepository.cs
+++ b/WmsLite.Api/Repositories/ZoneRepository.cs
@@ -66,8 +66,8 @@ public class ZoneRepository : BaseRepository, IZoneRepository
{
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 tenantId = ScopeTenantId;
+ var ownerCode = ScopeOwnerCode;
var kw = query.Keyword?.Trim();
var dbQuery = Db.Queryable()
diff --git a/WmsLite.Api/Services/AreaService.cs b/WmsLite.Api/Services/AreaService.cs
index 976348c..dd792b5 100644
--- a/WmsLite.Api/Services/AreaService.cs
+++ b/WmsLite.Api/Services/AreaService.cs
@@ -26,8 +26,6 @@ public class AreaService : IAreaService
public async Task> GetPagedListAsync(AreaPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _areaRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult
diff --git a/WmsLite.Api/Services/ContainerService.cs b/WmsLite.Api/Services/ContainerService.cs
index a6be48b..8cf0894 100644
--- a/WmsLite.Api/Services/ContainerService.cs
+++ b/WmsLite.Api/Services/ContainerService.cs
@@ -22,8 +22,6 @@ public class ContainerService : IContainerService
public async Task> GetPagedListAsync(ContainerPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _containerRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult
diff --git a/WmsLite.Api/Services/InventoryService.cs b/WmsLite.Api/Services/InventoryService.cs
index 4f05cff..3dc1b6d 100644
--- a/WmsLite.Api/Services/InventoryService.cs
+++ b/WmsLite.Api/Services/InventoryService.cs
@@ -54,8 +54,6 @@ public class InventoryService : IInventoryService
public async Task> GetPagedListAsync(InventoryPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var pageData = await _inventoryRepository.GetPagedListAsync(query);
var template = await _templateFieldValidationService.ValidateSearchParamAsync(
_userContext.TenantId.Trim(),
diff --git a/WmsLite.Api/Services/LocationService.cs b/WmsLite.Api/Services/LocationService.cs
index e139889..d44eac6 100644
--- a/WmsLite.Api/Services/LocationService.cs
+++ b/WmsLite.Api/Services/LocationService.cs
@@ -30,8 +30,6 @@ public class LocationService : ILocationService
public async Task> GetPagedListAsync(LocationPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _locationRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult
diff --git a/WmsLite.Api/Services/MaterialService.cs b/WmsLite.Api/Services/MaterialService.cs
index 8243562..c281a3b 100644
--- a/WmsLite.Api/Services/MaterialService.cs
+++ b/WmsLite.Api/Services/MaterialService.cs
@@ -22,8 +22,6 @@ public class MaterialService : IMaterialService
public async Task> GetPagedListAsync(MaterialPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _materialRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult
diff --git a/WmsLite.Api/Services/OrderServices.cs b/WmsLite.Api/Services/OrderServices.cs
index ceb3c92..fbaca79 100644
--- a/WmsLite.Api/Services/OrderServices.cs
+++ b/WmsLite.Api/Services/OrderServices.cs
@@ -241,8 +241,6 @@ public class InboundOrderService : OrderServiceBase, IInboundOrderService
public async Task> GetPagedListAsync(InboundOrderPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult
{
@@ -593,8 +591,6 @@ public class OutboundOrderService : OrderServiceBase, IOutboundOrderService
public async Task> GetPagedListAsync(OutboundOrderPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult
{
@@ -753,8 +749,6 @@ public class TransferOrderService : OrderServiceBase, ITransferOrderService
public async Task> GetPagedListAsync(TransferOrderPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult
{
@@ -930,8 +924,6 @@ public class StocktakeOrderService : OrderServiceBase, IStocktakeOrderService
public async Task> GetPagedListAsync(StocktakeOrderPagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _orderRepository.GetPagedListAsync(query);
return new PagedResult
{
diff --git a/WmsLite.Api/Services/SysTemplateService.cs b/WmsLite.Api/Services/SysTemplateService.cs
index 1ff455b..8fa503c 100644
--- a/WmsLite.Api/Services/SysTemplateService.cs
+++ b/WmsLite.Api/Services/SysTemplateService.cs
@@ -20,8 +20,6 @@ public class SysTemplateService : ISysTemplateService
public async Task> GetPagedListAsync(SysTemplatePagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _repository.GetPagedListAsync(query);
return new PagedResult
{
diff --git a/WmsLite.Api/Services/WarehouseService.cs b/WmsLite.Api/Services/WarehouseService.cs
index ca8e3c2..5cb3466 100644
--- a/WmsLite.Api/Services/WarehouseService.cs
+++ b/WmsLite.Api/Services/WarehouseService.cs
@@ -22,8 +22,6 @@ public class WarehouseService : IWarehouseService
public async Task> GetPagedListAsync(WarehousePagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _warehouseRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult
diff --git a/WmsLite.Api/Services/ZoneService.cs b/WmsLite.Api/Services/ZoneService.cs
index c38bf3e..97f8ec0 100644
--- a/WmsLite.Api/Services/ZoneService.cs
+++ b/WmsLite.Api/Services/ZoneService.cs
@@ -29,8 +29,6 @@ public class ZoneService : IZoneService
public async Task> GetPagedListAsync(ZonePagedQuery query)
{
- query.TenantId = _userContext.TenantId.Trim();
- query.OwnerCode = _userContext.OwnerCode.Trim();
var page = await _zoneRepository.GetPagedListAsync(query);
var items = page.Items.ConvertAll(MapToView);
return new PagedResult