库存展示修改 主数据层级联动

This commit is contained in:
zhougf committed 2026-06-01 23:49:07 +08:00
1 parent 7f621dd553
commit 3c6dfda5e5
13 files changed
+488 -42

No files matched your search

+11 -4
View File
@@ -15,10 +15,16 @@ public class OrderNumberGenerator : IOrderNumberGenerator
}
public async Task<string> NextInboundOrderNoAsync(string tenantId, string ownerCode, CancellationToken cancellationToken = default)
=> await NextOrderNoAsync<Models.InboundOrder>(tenantId, ownerCode, "IN", "入库单");
public async Task<string> NextOutboundOrderNoAsync(string tenantId, string ownerCode, CancellationToken cancellationToken = default)
=> await NextOrderNoAsync<Models.OutboundOrder>(tenantId, ownerCode, "OUT", "出库单");
private async Task<string> NextOrderNoAsync<TOrder>(string tenantId, string ownerCode, string prefix, string displayName)
where TOrder : Models.BaseEntity, new()
{
var tenant = tenantId.Trim();
var owner = ownerCode.Trim();
var prefix = "IN";
var datePart = DateTime.Now.ToString("yyyyMMdd", CultureInfo.InvariantCulture);
const int maxAttempts = 5;
@@ -26,8 +32,9 @@ public class OrderNumberGenerator : IOrderNumberGenerator
{
var seq = await AllocateSequenceAsync(tenant, owner, prefix, datePart);
var no = $"{prefix}{datePart}{seq.ToString("D5", CultureInfo.InvariantCulture)}";
var exists = await _db.Queryable<Models.InboundOrder>()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner && x.OrderNo == no)
var exists = await _db.Queryable<TOrder>()
.Where(x => !x.IsDeleted && x.TenantId == tenant && x.OwnerCode == owner)
.Where("order_no = @orderNo", new { orderNo = no })
.AnyAsync();
if (!exists)
{
@@ -35,7 +42,7 @@ public class OrderNumberGenerator : IOrderNumberGenerator
}
}
throw new BusinessException("生成唯一入库单单号失败,请重试。");
throw new BusinessException($"生成唯一{displayName}单号失败,请重试。");
}
private async Task<int> AllocateSequenceAsync(string tenantId, string ownerCode, string prefix, string dateYyyyMmDd)