|
|
@@ -7,10 +7,18 @@ namespace Admin.NET.Plugin.AiDOP.Production;
|
|
|
/// <summary>
|
|
|
/// 工单工序排产服务 🏭
|
|
|
/// 路由前缀:/api/Production/scheduling/...
|
|
|
+///
|
|
|
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
|
|
|
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
|
|
|
+/// <para>
|
|
|
+/// 原实现:类级 <c>[AllowAnonymous]</c> + 部分端点 <c>AidopTenantHelper.Resolve(App.HttpContext)</c>
|
|
|
+/// (解析链含 query 参数 tenantId 与 DefaultTenantId 兜底);且写端点(save/status/urgent/sync-routing 等)
|
|
|
+/// 仅按前端直传的 <c>Domain</c> 字符串定位 WorkOrdMaster(无 tenant_id 条件),
|
|
|
+/// 叠加后未认证方可指定任意租户改写工单。现共享匹配片段一律追加 <c>tenant_id = @TenantId</c> 强校验。
|
|
|
+/// </para>
|
|
|
/// </summary>
|
|
|
[ApiDescriptionSettings(Order = 265, Description = "工单工序排产")]
|
|
|
[Route("api/Production")]
|
|
|
-[AllowAnonymous]
|
|
|
[NonUnify]
|
|
|
public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
@@ -39,9 +47,10 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
|
|
|
/// <summary>
|
|
|
/// 主表 WorkOrdMaster 按工单号 +「公司域或租户 id」匹配:<c>domain</c> 可为原 <c>Domain</c> 列,或与 <c>tenant_id</c> 相同的字符串(列表已做 COALESCE 回传)。
|
|
|
+ /// 追加 <c>tenant_id = @TenantId</c>:Domain 仅作定位,租户强校验不可被前端直传值绕过(每处使用需带 @TenantId 参数)。
|
|
|
/// </summary>
|
|
|
private const string SqlWorkOrdMasterMatchDomainOrTenant = """
|
|
|
- WorkOrd = @WorkOrd AND (
|
|
|
+ WorkOrd = @WorkOrd AND tenant_id = @TenantId AND (
|
|
|
TRIM(IFNULL(`Domain`, '')) = TRIM(@Domain)
|
|
|
OR (
|
|
|
TRIM(IFNULL(`Domain`, '')) = ''
|
|
|
@@ -51,9 +60,9 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
)
|
|
|
""";
|
|
|
|
|
|
- /// <summary>带表别名的 WorkOrdMaster 匹配(参数 <c>alias</c> 为表别名,如 a、w)。</summary>
|
|
|
+ /// <summary>带表别名的 WorkOrdMaster 匹配(参数 <c>alias</c> 为表别名,如 a、w);同上追加 <c>tenant_id = @TenantId</c> 强校验。</summary>
|
|
|
private static string SqlWorkOrdMasterMatchDomainOrTenantAliased(string alias) => $"""
|
|
|
- {alias}.WorkOrd = @WorkOrd AND (
|
|
|
+ {alias}.WorkOrd = @WorkOrd AND {alias}.tenant_id = @TenantId AND (
|
|
|
TRIM(IFNULL({alias}.`Domain`, '')) = TRIM(@Domain)
|
|
|
OR (
|
|
|
TRIM(IFNULL({alias}.`Domain`, '')) = ''
|
|
|
@@ -63,13 +72,14 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
)
|
|
|
""";
|
|
|
|
|
|
- /// <summary>子表(工序/明细)按工单号 + 域或主表租户匹配。</summary>
|
|
|
+ /// <summary>子表(工序/明细)按工单号 + 域或主表租户匹配;EXISTS 内追加主表 <c>tenant_id = @TenantId</c> 强校验。</summary>
|
|
|
private static string SqlWorkOrdChildMatchDomainOrTenant(string childAlias, string masterAlias) => $"""
|
|
|
{childAlias}.WorkOrd = @WorkOrd AND (
|
|
|
TRIM(IFNULL({childAlias}.`Domain`, '')) = TRIM(@Domain)
|
|
|
OR EXISTS (
|
|
|
SELECT 1 FROM WorkOrdMaster {masterAlias}
|
|
|
WHERE {masterAlias}.WorkOrd = {childAlias}.WorkOrd
|
|
|
+ AND {masterAlias}.tenant_id = @TenantId
|
|
|
AND (
|
|
|
TRIM(IFNULL({masterAlias}.`Domain`, '')) = TRIM(@Domain)
|
|
|
OR (
|
|
|
@@ -82,9 +92,9 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
)
|
|
|
""";
|
|
|
|
|
|
- /// <summary>按主键 +「公司域或租户 id」匹配(状态更新等)。</summary>
|
|
|
+ /// <summary>按主键 +「公司域或租户 id」匹配(状态更新等);同上追加 <c>tenant_id = @TenantId</c> 强校验。</summary>
|
|
|
private const string SqlWorkOrdMasterMatchRecIdAndDomainOrTenant = """
|
|
|
- RecID = @Id AND (
|
|
|
+ RecID = @Id AND tenant_id = @TenantId AND (
|
|
|
TRIM(IFNULL(`Domain`, '')) = TRIM(@Domain)
|
|
|
OR (
|
|
|
TRIM(IFNULL(`Domain`, '')) = ''
|
|
|
@@ -104,7 +114,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
//const string C = "utf8mb4_general_ci";
|
|
|
const string C = "utf8mb4_0900_ai_ci";
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
|
|
|
|
|
|
var innerWhere = new List<string>
|
|
|
@@ -204,7 +214,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(workOrd) || string.IsNullOrWhiteSpace(domain))
|
|
|
throw Oops.Oh("工单号与公司域名不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
string sql = $"""
|
|
|
SELECT
|
|
|
a.WorkOrd,
|
|
|
@@ -234,7 +244,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(workOrd) || string.IsNullOrWhiteSpace(domain))
|
|
|
throw Oops.Oh("工单号与公司域名不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
string masterSql = $"""
|
|
|
SELECT
|
|
|
a.WorkOrd,
|
|
|
@@ -293,7 +303,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(workOrd))
|
|
|
throw Oops.Oh("工单号不能为空");
|
|
|
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
string sql = $"""
|
|
|
SELECT d.RecID, d.ItemNum, d.Op, d.QtyRequired, IFNULL(d.FrozenBOMQty, 0) AS FrozenBOMQty,
|
|
|
IFNULL(d.Location, '') AS Location, IFNULL(d.LotSerial, '') AS LotSerial, d.WorkOrd
|
|
|
@@ -312,7 +322,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(workOrd))
|
|
|
throw Oops.Oh("工单号不能为空");
|
|
|
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
string sql = $"""
|
|
|
SELECT
|
|
|
r.RecID, r.OP AS Op, r.Descr AS Descr,
|
|
|
@@ -346,14 +356,14 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
ORDER BY (r.OP + 0) ASC, r.OP ASC, r.Line ASC, r.ColumnNum ASC
|
|
|
""";
|
|
|
var list = await _db.Ado.SqlQueryAsync<WorkOrderViewRoutingRow>(sql, new { WorkOrd = workOrd.Trim(), TenantId = tenantId });
|
|
|
- var summary = await QueryExecutionProgressAsync(workOrd.Trim(), domain?.Trim() ?? "");
|
|
|
+ var summary = await QueryExecutionProgressAsync(workOrd.Trim(), domain?.Trim() ?? "", tenantId);
|
|
|
return new { list, summary };
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
/// 工序执行进度汇总,与工单执行进度看板共用 <see cref="WorkOrderExecutionProgressSql"/> 口径。
|
|
|
/// </summary>
|
|
|
- private async Task<WorkOrderExecutionProgress?> QueryExecutionProgressAsync(string workOrd, string domain)
|
|
|
+ private async Task<WorkOrderExecutionProgress?> QueryExecutionProgressAsync(string workOrd, string domain, long tenantId)
|
|
|
{
|
|
|
var routingMatch = SqlWorkOrdChildMatchDomainOrTenant("r", "rm");
|
|
|
string sql = $"""
|
|
|
@@ -366,7 +376,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
WHERE {SqlWorkOrdMasterMatchDomainOrTenantAliased("wm")}
|
|
|
LIMIT 1
|
|
|
""";
|
|
|
- var rows = await _db.Ado.SqlQueryAsync<WorkOrderExecutionProgress>(sql, new { WorkOrd = workOrd, Domain = domain });
|
|
|
+ var rows = await _db.Ado.SqlQueryAsync<WorkOrderExecutionProgress>(sql, new { WorkOrd = workOrd, Domain = domain, TenantId = tenantId });
|
|
|
return rows.FirstOrDefault();
|
|
|
}
|
|
|
|
|
|
@@ -382,7 +392,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
|
|
|
var w = workOrd.Trim();
|
|
|
var d = domain.Trim();
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
|
|
|
string masterSql = $"""
|
|
|
SELECT
|
|
|
@@ -697,12 +707,14 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
var account = _userManager.Account ?? "system";
|
|
|
var workOrd = input.WorkOrd.Trim();
|
|
|
var domain = input.Domain.Trim();
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
|
|
|
// ── 1. 获取旧的 QtyOrded,用于判断数量是否变更 ──
|
|
|
var oldQtyOrded = await _db.Ado.GetDecimalAsync(
|
|
|
$"SELECT IFNULL(QtyOrded, 0) FROM WorkOrdMaster WHERE {SqlWorkOrdMasterMatchDomainOrTenant}",
|
|
|
new SugarParameter("@WorkOrd", workOrd),
|
|
|
- new SugarParameter("@Domain", domain));
|
|
|
+ new SugarParameter("@Domain", domain),
|
|
|
+ new SugarParameter("@TenantId", tenantId));
|
|
|
|
|
|
var newQtyOrded = input.QtyOrded;
|
|
|
var qtyChanged = newQtyOrded.HasValue && oldQtyOrded > 0 && newQtyOrded.Value != oldQtyOrded;
|
|
|
@@ -717,7 +729,8 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new("@UpdateUser", account),
|
|
|
new("@UpdateTime", DateTime.Now),
|
|
|
new("@WorkOrd", workOrd),
|
|
|
- new("@Domain", domain)
|
|
|
+ new("@Domain", domain),
|
|
|
+ new("@TenantId", tenantId)
|
|
|
};
|
|
|
|
|
|
var n = await _db.Ado.ExecuteCommandAsync(
|
|
|
@@ -754,7 +767,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new SugarParameter("@Ratio", ratio),
|
|
|
new SugarParameter("@User", account),
|
|
|
new SugarParameter("@Now", now),
|
|
|
- new SugarParameter("@TenantId", domain),
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrd", workOrd));
|
|
|
|
|
|
// 3b. WorkOrdRouting: 同步 QtyOrded
|
|
|
@@ -769,7 +782,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new SugarParameter("@QtyOrded", newQtyOrded.Value),
|
|
|
new SugarParameter("@User", account),
|
|
|
new SugarParameter("@Now", now),
|
|
|
- new SugarParameter("@TenantId", domain),
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrd", workOrd));
|
|
|
|
|
|
// 3c. NbrDetail: 按比例调整 QtyOrd 和 CurrQtyOpened(仅下达/投产/暂停状态)
|
|
|
@@ -778,7 +791,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
SELECT IFNULL(LOWER(TRIM(Status)), '') FROM WorkOrdMaster
|
|
|
WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd LIMIT 1
|
|
|
""",
|
|
|
- new SugarParameter("@TenantId", domain),
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrd", workOrd));
|
|
|
|
|
|
if (woStatus is "r" or "w" or "s")
|
|
|
@@ -801,7 +814,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new SugarParameter("@Ratio", ratio),
|
|
|
new SugarParameter("@User", account),
|
|
|
new SugarParameter("@Now", now),
|
|
|
- new SugarParameter("@TenantId", domain),
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrd", workOrd));
|
|
|
}
|
|
|
}
|
|
|
@@ -818,13 +831,15 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
var account = _userManager.Account ?? "system";
|
|
|
var status = input.Status.Trim().ToLowerInvariant();
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var pars = new List<SugarParameter>
|
|
|
{
|
|
|
new("@Status", status),
|
|
|
new("@UpdateUser", account),
|
|
|
new("@UpdateTime", DateTime.Now),
|
|
|
new("@Id", input.Id),
|
|
|
- new("@Domain", input.Domain.Trim())
|
|
|
+ new("@Domain", input.Domain.Trim()),
|
|
|
+ new("@TenantId", tenantId)
|
|
|
};
|
|
|
var n = await _db.Ado.ExecuteCommandAsync(
|
|
|
$"""
|
|
|
@@ -849,6 +864,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
+ long tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var row = await _db.Ado.SqlQuerySingleAsync<WorkOrderInfo>(
|
|
|
$"""
|
|
|
SELECT WorkOrd, IFNULL(NULLIF(TRIM(`Domain`),''), CAST(IFNULL(tenant_id,0) AS CHAR)) AS Domain
|
|
|
@@ -859,12 +875,12 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new List<SugarParameter>
|
|
|
{
|
|
|
new("@Id", recId),
|
|
|
- new("@Domain", domain)
|
|
|
+ new("@Domain", domain),
|
|
|
+ new("@TenantId", tenantId)
|
|
|
});
|
|
|
if (row == null || string.IsNullOrWhiteSpace(row.WorkOrd)) return;
|
|
|
|
|
|
string idem = $"{row.Domain}#{row.WorkOrd}#{status}";
|
|
|
- long tenantId = _userManager.TenantId;
|
|
|
var payload = JsonSerializer.Serialize(new
|
|
|
{
|
|
|
path = "/mes/schedule/dispatch",
|
|
|
@@ -936,8 +952,8 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
// 获取该域的工单号列表(竖线分隔)
|
|
|
var domainWorkOrds = string.Join("|", workOrders.Where(x => x.Domain == domain).Select(x => x.WorkOrd));
|
|
|
|
|
|
- // 执行关闭逻辑(模拟存储过程)
|
|
|
- await ExecuteCloseWorkOrders(domain, domainWorkOrds);
|
|
|
+ // 执行关闭逻辑(模拟存储过程);租户一律用严格解析的 tenantId,不再用 Domain 冒充
|
|
|
+ await ExecuteCloseWorkOrders(tenantId, domain, domainWorkOrds);
|
|
|
}
|
|
|
|
|
|
_db.Ado.CommitTran();
|
|
|
@@ -969,9 +985,9 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
- /// 执行关闭工单逻辑(模拟存储过程 pr_MES_CloseWorkOrders)
|
|
|
+ /// 执行关闭工单逻辑(模拟存储过程 pr_MES_CloseWorkOrders);tenant_id 一律用严格解析的 tenantId,Domain 仅用于 NbrMaster.Domain 列匹配。
|
|
|
/// </summary>
|
|
|
- private async Task ExecuteCloseWorkOrders(string domain, string workOrds)
|
|
|
+ private async Task ExecuteCloseWorkOrders(long tenantId, string domain, string workOrds)
|
|
|
{
|
|
|
if (string.IsNullOrWhiteSpace(workOrds))
|
|
|
return;
|
|
|
@@ -981,50 +997,52 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
|
|
|
// 1. 更新工单状态为C
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "UPDATE WorkOrdMaster SET Status = 'C', UpdateUser = 'proc' WHERE tenant_id = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "UPDATE WorkOrdMaster SET Status = 'C', UpdateUser = 'proc' WHERE tenant_id = @TenantId AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 2. 更新领料单状态为C
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "UPDATE NbrMaster SET Status = 'C' WHERE Type = 'SM' AND tenant_id = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "UPDATE NbrMaster SET Status = 'C' WHERE Type = 'SM' AND tenant_id = @TenantId AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 3. 更新领料单明细状态为C
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "UPDATE NbrDetail SET Status = 'C' WHERE tenant_id = @Domain AND Type = 'SM' AND Nbr IN (SELECT Nbr FROM NbrMaster WHERE Type = 'SM' AND Domain = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0)",
|
|
|
+ "UPDATE NbrDetail SET Status = 'C' WHERE tenant_id = @TenantId AND Type = 'SM' AND Nbr IN (SELECT Nbr FROM NbrMaster WHERE Type = 'SM' AND Domain = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0)",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@Domain", domain),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 4. 更新退料单状态为C
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "UPDATE NbrMaster SET Status = 'C' WHERE Type = 'WOD' AND tenant_id = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "UPDATE NbrMaster SET Status = 'C' WHERE Type = 'WOD' AND tenant_id = @TenantId AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 5. 更新退料单明细状态为C
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "UPDATE NbrDetail SET Status = 'C' WHERE tenant_id = @Domain AND Type = 'WOD' AND Nbr IN (SELECT Nbr FROM NbrMaster WHERE Type = 'WOD' AND Domain = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0)",
|
|
|
+ "UPDATE NbrDetail SET Status = 'C' WHERE tenant_id = @TenantId AND Type = 'WOD' AND Nbr IN (SELECT Nbr FROM NbrMaster WHERE Type = 'WOD' AND Domain = @Domain AND FIND_IN_SET(WorkOrd, @WorkOrds) > 0)",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@Domain", domain),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 6. 删除库存占用
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "DELETE FROM ic_item_stockoccupy WHERE tenant_id = @Domain AND FIND_IN_SET(morder_mo, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "DELETE FROM ic_item_stockoccupy WHERE tenant_id = @TenantId AND FIND_IN_SET(morder_mo, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 7. 删除PO占用
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "DELETE FROM srm_po_occupy WHERE tenant_id = @Domain AND FIND_IN_SET(morder_mo, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "DELETE FROM srm_po_occupy WHERE tenant_id = @TenantId AND FIND_IN_SET(morder_mo, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
|
|
|
// 8. 删除工单占用
|
|
|
await _db.Ado.ExecuteCommandAsync(
|
|
|
- "DELETE FROM mes_mooccupy WHERE tenant_id = @Domain AND FIND_IN_SET(moo_mo, @WorkOrds) > 0",
|
|
|
- new SugarParameter("@Domain", domain),
|
|
|
+ "DELETE FROM mes_mooccupy WHERE tenant_id = @TenantId AND FIND_IN_SET(moo_mo, @WorkOrds) > 0",
|
|
|
+ new SugarParameter("@TenantId", tenantId),
|
|
|
new SugarParameter("@WorkOrds", workOrdsForFindInSet));
|
|
|
}
|
|
|
|
|
|
@@ -1037,6 +1055,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
var workOrd = input.WorkOrd.Trim();
|
|
|
var domain = input.Domain.Trim();
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var createUser = (_userManager.Account ?? "system").Trim();
|
|
|
if (createUser.Length > 24)
|
|
|
createUser = createUser[..24];
|
|
|
@@ -1045,7 +1064,8 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
{
|
|
|
new("@WorkOrd", workOrd),
|
|
|
new("@Domain", domain),
|
|
|
- new("@CreateUser", createUser)
|
|
|
+ new("@CreateUser", createUser),
|
|
|
+ new("@TenantId", tenantId)
|
|
|
};
|
|
|
|
|
|
await _db.Ado.BeginTranAsync();
|
|
|
@@ -1138,7 +1158,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/work-ord-options")]
|
|
|
public async Task<object> GetWorkOrdOptions()
|
|
|
{
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var list = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
"""
|
|
|
SELECT WorkOrd FROM WorkOrdMaster
|
|
|
@@ -1158,7 +1178,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/work-ctr-options")]
|
|
|
public async Task<object> GetWorkCtrOptions()
|
|
|
{
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var list = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
"""
|
|
|
SELECT WorkCtr, IFNULL(Descr, '') AS Descr
|
|
|
@@ -1177,7 +1197,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/line-options")]
|
|
|
public async Task<object> GetLineOptions()
|
|
|
{
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var list = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
"""
|
|
|
SELECT Line, IFNULL(`Describe`, '') AS `Describe`
|
|
|
@@ -1196,7 +1216,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/supp-options")]
|
|
|
public async Task<object> GetSuppOptions()
|
|
|
{
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var list = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
"""
|
|
|
SELECT Supp, TRIM(CONCAT(Supp, ' ', IFNULL(SortName, ''))) AS SuppName
|
|
|
@@ -1224,7 +1244,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(input.ItemNum))
|
|
|
throw Oops.Oh("物料号不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var account = _userManager.Account ?? "system";
|
|
|
var now = DateTime.Now;
|
|
|
var workOrd = input.WorkOrd.Trim();
|
|
|
@@ -1381,7 +1401,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (input.RecID == 0)
|
|
|
throw Oops.Oh("主键不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
|
|
|
// 获取物料明细信息用于NbrDetail同步
|
|
|
var detailRows = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
@@ -1443,7 +1463,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (string.IsNullOrWhiteSpace(input.OP))
|
|
|
throw Oops.Oh("工序不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var account = _userManager.Account ?? "system";
|
|
|
var now = DateTime.Now;
|
|
|
var workOrd = input.WorkOrd.Trim();
|
|
|
@@ -1621,7 +1641,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
if (input.RecID == 0)
|
|
|
throw Oops.Oh("主键不能为空");
|
|
|
|
|
|
- var tenantId = _userManager.TenantId;
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
|
|
|
// 检查后序是否已有完成数量
|
|
|
var detailRows = await _db.Ado.SqlQueryAsync<dynamic>(
|
|
|
@@ -1797,6 +1817,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
public async Task<object> SetUrgent([FromBody] WorkOrderUrgentInput input)
|
|
|
{
|
|
|
var account = _userManager.Account ?? "system";
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var n = await _db.Ado.ExecuteCommandAsync(
|
|
|
$"""
|
|
|
UPDATE WorkOrdMaster
|
|
|
@@ -1811,7 +1832,8 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
new("@UpdateUser", account),
|
|
|
new("@UpdateTime", DateTime.Now),
|
|
|
new("@WorkOrd", input.WorkOrd.Trim()),
|
|
|
- new("@Domain", input.Domain.Trim())
|
|
|
+ new("@Domain", input.Domain.Trim()),
|
|
|
+ new("@TenantId", tenantId)
|
|
|
});
|
|
|
if (n == 0)
|
|
|
throw Oops.Oh("工单不存在");
|
|
|
@@ -1828,7 +1850,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/gantt-data")]
|
|
|
public async Task<object> GetGanttData([FromQuery] string? workOrd, [FromQuery] string? startDate, [FromQuery] string? endDate)
|
|
|
{
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
|
|
|
var where = new List<string>
|
|
|
{
|
|
|
@@ -1940,7 +1962,7 @@ public class WorkOrderSchedulingService : IDynamicApiController, ITransient
|
|
|
[HttpGet("scheduling/line-gantt-data")]
|
|
|
public async Task<object> GetLineGanttData([FromQuery] string? prodLine, [FromQuery] string? startDate, [FromQuery] string? endDate)
|
|
|
{
|
|
|
- var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
|
|
|
+ var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
|
|
|
var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
|
|
|
var where = new List<string>
|
|
|
{
|