Procházet zdrojové kódy

fix: AiDOP租户安全整改(B-1/B-2/S1/RuleConfig)+物料采购订单列表去掉发布列

Pengxy před 1 měsícem
rodič
revize
0a8a419c76
51 změnil soubory, kde provedl 493 přidání a 404 odebrání
  1. 1 1
      Web/package.json
  2. 4 6
      Web/src/views/aidop/api/actionRunLog.ts
  3. 2 5
      Web/src/views/aidop/api/workOrderDispatch.ts
  4. 1 23
      Web/src/views/aidop/business/workOrderDispatchForm.vue
  5. 0 9
      Web/src/views/aidop/business/workOrderDispatchList.vue
  6. 1 9
      Web/src/views/aidop/data-platform/actionRunLogs.vue
  7. 4 3
      Web/src/views/aidop/s3/api/deliverySchedule.ts
  8. 1 11
      Web/src/views/aidop/s3/supply/deliveryScheduleList.vue
  9. 2 5
      Web/src/views/aidop/s3/supply/purchaseOrderList.vue
  10. 3 3
      server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj
  11. 10 11
      server/Plugins/Admin.NET.Plugin.AiDOP/Infrastructure/AidopActionRunLogQueryService.cs
  12. 16 12
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/AsnShipperService.cs
  13. 11 7
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/ContractReviewService.cs
  14. 9 5
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/LinkagePlanService.cs
  15. 9 5
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/MdpMonitorService.cs
  16. 12 8
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/OrderDeliveryService.cs
  17. 5 12
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/OrderReviewOrchestrationService.cs
  18. 14 12
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/ProductDesignService.cs
  19. 6 2
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/RequirementExamineDetailService.cs
  20. 8 4
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/S1MdpMonitorService.cs
  21. 13 8
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/SeOrderService.cs
  22. 9 5
      server/Plugins/Admin.NET.Plugin.AiDOP/Order/ShippingPlanService.cs
  23. 8 2
      server/Plugins/Admin.NET.Plugin.AiDOP/ProcurementExecution/IqcReturnQueryService.cs
  24. 23 14
      server/Plugins/Admin.NET.Plugin.AiDOP/ProcurementExecution/PurchaseReturnService.cs
  25. 7 4
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/ExecutableDailyPlanService.cs
  26. 8 5
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/HolidayMasterService.cs
  27. 16 7
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/ProductionSchedulingActionService.cs
  28. 9 6
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/QualityLineWorkDetailService.cs
  29. 9 6
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/ResourceOvertimeService.cs
  30. 8 5
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/ScheduleExceptionService.cs
  31. 9 6
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/ShopCalendarWorkCtrService.cs
  32. 5 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/WorkOrderProgressDashboardService.cs
  33. 77 55
      server/Plugins/Admin.NET.Plugin.AiDOP/Production/WorkOrderSchedulingService.cs
  34. 10 3
      server/Plugins/Admin.NET.Plugin.AiDOP/Rule/RuleConfigQueryService.cs
  35. 7 9
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DeliveryExceptionService.cs
  36. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DeliveryScheduleService.cs
  37. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DemandOrderService.cs
  38. 28 27
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DemandScheduleService.cs
  39. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/OutsourceOrderService.cs
  40. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/ProcessOutsourceOrderService.cs
  41. 19 12
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/ProcurementPipelineService.cs
  42. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/PurchaseOrderService.cs
  43. 23 26
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/PurchaseRequestService.cs
  44. 14 20
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/S3MdpMonitorService.cs
  45. 4 1
      server/Plugins/Admin.NET.Plugin.AiDOP/Supply/WorkOrderMaterialReadinessService.cs
  46. 6 2
      server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalCustomerService.cs
  47. 6 2
      server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalItemService.cs
  48. 6 2
      server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalSourceListService.cs
  49. 6 2
      server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalWorkOrderService.cs
  50. 11 5
      server/Plugins/Admin.NET.Plugin.AiDOP/WorkOrder/MaterialRequirementGenerationService.cs
  51. 13 11
      server/Plugins/Admin.NET.Plugin.AiDOP/WorkOrder/WorkOrderDispatchService.cs

+ 1 - 1
Web/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "admin.net",
 	"type": "module",
-	"version": "2.4.406",
+	"version": "2.4.407",
 	"packageManager": "pnpm@10.32.1",
 	"lastBuildTime": "2026.03.15",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",

+ 4 - 6
Web/src/views/aidop/api/actionRunLog.ts

@@ -46,10 +46,10 @@ export interface ProcurementPipelineResult {
 	message?: string;
 }
 
-export function executeProcurementPipeline(tenantId: string, createFromShortage = true, mergeHistorical = true) {
+export function executeProcurementPipeline(createFromShortage = true, mergeHistorical = true) {
 	return service
 		.post<ProcurementPipelineResult>('/api/Supply/procurement/execute-pipeline', null, {
-			params: { tenantId, createFromShortage, mergeHistorical },
+			params: { createFromShortage, mergeHistorical },
 		})
 		.then((r) => r.data);
 }
@@ -67,10 +67,8 @@ export interface S4ReadPathConsistencyResult {
 	checks?: S4ReadPathCheckItem[];
 }
 
-export function fetchS4ReadPathConsistency(tenantId: string) {
+export function fetchS4ReadPathConsistency() {
 	return service
-		.get<S4ReadPathConsistencyResult>('/api/Supply/procurement/read-path-consistency', {
-			params: { tenantId },
-		})
+		.get<S4ReadPathConsistencyResult>('/api/Supply/procurement/read-path-consistency')
 		.then((r) => r.data);
 }

+ 2 - 5
Web/src/views/aidop/api/workOrderDispatch.ts

@@ -29,8 +29,6 @@ export interface WorkOrderDispatchRow {
 
 export interface WorkOrderReleaseParams {
 	workOrd: string;
-	/** 租户 ID(WorkOrdMaster.tenant_id) */
-	tenantId: number;
 	ordDate: string;
 	lotSerial?: string | null;
 	/** 登录账号(批量齐套检查等场景使用) */
@@ -85,11 +83,10 @@ export interface NextLotSerialResult {
 	lotSerial: string;
 }
 
-/** 下一生产批号:本系统接口(按 tenant_id + 初始工单取号) */
-export function fetchNextLotSerial(payload: { tenantId: number; workOrd: string }) {
+/** 下一生产批号:本系统接口(租户由认证后 JWT 解析,按 tenant_id + 初始工单取号) */
+export function fetchNextLotSerial(payload: { workOrd: string }) {
 	const params: Record<string, string | number> = {
 		workOrd: payload.workOrd.trim(),
-		tenantId: payload.tenantId,
 	};
 	return service
 		.get<NextLotSerialResult & { result?: NextLotSerialResult }>('/api/WorkOrder/dispatch/next-lot-serial', {

+ 1 - 23
Web/src/views/aidop/business/workOrderDispatchForm.vue

@@ -44,21 +44,10 @@ const userInfo = useUserInfo();
 
 const props = defineProps<{
 	workOrd: string;
-	/** 可选;不传或 0 时用当前登录用户租户 */
-	tenantId?: number;
 	initOrdDate?: string | null;
 	initLotSerial?: string | null;
 }>();
 
-function resolvedTenantId(): number {
-	if (props.tenantId != null && props.tenantId > 0) return props.tenantId;
-	const u = userInfo.userInfos;
-	const tid = u?.currentTenantId ?? u?.tenantId;
-	if (tid === undefined || tid === null) return 0;
-	const n = Number(tid);
-	return Number.isFinite(n) ? n : 0;
-}
-
 /** 本地日历「今天」零点,用于与所选日期比较 */
 function startOfLocalDay(d: Date): Date {
 	const x = new Date(d);
@@ -88,14 +77,9 @@ const form = reactive({
 async function ensureLotSerialIfEmpty() {
 	const cur = (form.lotSerial ?? '').trim();
 	if (cur) return;
-	const tid = resolvedTenantId();
-	if (!tid) {
-		ElMessage.error('无法解析租户信息,请重新登录后再试');
-		throw new Error('no tenant');
-	}
 	lotSerialLoading.value = true;
 	try {
-		const { lotSerial } = await fetchNextLotSerial({ tenantId: tid, workOrd: props.workOrd });
+		const { lotSerial } = await fetchNextLotSerial({ workOrd: props.workOrd });
 		form.lotSerial = lotSerial;
 	} catch (e: any) {
 		ElMessage.error(e?.message || '获取生产批号失败,请手填后重试');
@@ -152,14 +136,8 @@ async function onSave() {
 
 	saving.value = true;
 	try {
-		const tid = resolvedTenantId();
-		if (!tid) {
-			ElMessage.error('无法解析租户信息,请重新登录后再试');
-			return;
-		}
 		const releaseRes = await releaseWorkOrder({
 			workOrd: props.workOrd,
-			tenantId: tid,
 			ordDate: form.ordDate,
 			lotSerial: form.lotSerial.trim() || null,
 			userAccount: userInfo.userInfos?.account ?? '',

+ 0 - 9
Web/src/views/aidop/business/workOrderDispatchList.vue

@@ -106,7 +106,6 @@
 		<el-dialog v-model="releaseVisible" title="工单下达" width="480px" destroy-on-close>
 			<WorkOrderDispatchForm
 				:work-ord="releasingRow?.workOrd ?? ''"
-				:tenant-id="domainParamFromCurrentTenantNumber()"
 				:init-ord-date="releasingRow?.ordDate ?? ''"
 				:init-lot-serial="releasingRow?.lotSerial ?? ''"
 				@cancel="releaseVisible = false"
@@ -196,14 +195,6 @@ function domainParamFromCurrentTenant(): string | null {
 	return String(tid);
 }
 
-/** 当前用户租户 ID(数字),用于工单下达 / 取生产批号 */
-function domainParamFromCurrentTenantNumber(): number {
-	const s = domainParamFromCurrentTenant();
-	if (!s) return 0;
-	const n = Number(s);
-	return Number.isFinite(n) ? n : 0;
-}
-
 function doSearch() {
 	query.page = 1;
 	loadList();

+ 1 - 9
Web/src/views/aidop/data-platform/actionRunLogs.vue

@@ -69,7 +69,6 @@
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import AidopDemoShell from '../components/AidopDemoShell.vue';
-import { useUserInfo } from '/@/stores/userInfo';
 import {
 	fetchActionRunLogCodes,
 	fetchActionRunLogList,
@@ -77,7 +76,6 @@ import {
 	type ActionRunLogRow,
 } from '../api/actionRunLog';
 
-const userInfo = useUserInfo();
 const consistencyLoading = ref(false);
 
 const loading = ref(false);
@@ -139,15 +137,9 @@ function reset() {
 }
 
 async function onReadPathConsistency() {
-	const u = userInfo.userInfos;
-	const tid = u?.currentTenantId ?? u?.tenantId;
-	if (tid === undefined || tid === null || String(tid).trim() === '') {
-		ElMessage.error('当前用户无租户信息');
-		return;
-	}
 	consistencyLoading.value = true;
 	try {
-		const result = await fetchS4ReadPathConsistency(String(tid));
+		const result = await fetchS4ReadPathConsistency();
 		const lines = (result.checks ?? []).map(
 			(c) => `${c.name}: 运行表=${c.runtimeCount ?? 0}, DWD=${c.dwdCount ?? '—'}, ${c.ok ? '一致' : '待对账'}`
 		);

+ 4 - 3
Web/src/views/aidop/s3/api/deliverySchedule.ts

@@ -89,6 +89,7 @@ export interface RuleConfigSnapshot<TOptions = S3DeliveryGenerateRuleOptions> {
 }
 
 export interface SaveS3DeliveryGenerateRuleInput {
+	/** 已废弃:租户由认证后 JWT 解析,不再传值 */
 	tenantId?: number | string;
 	factoryId?: number | string | null;
 	options: S3DeliveryGenerateRuleOptions;
@@ -139,11 +140,11 @@ export interface ProcurementPipelineResult {
 	warnings?: string[];
 }
 
-/** S4 采购闭环:合并 PR、转 DO/PO、写 QadTracking(替代旧 AutoTransferDoOrPo) */
-export function executeProcurementPipeline(tenantId?: string, mergeHistorical = true) {
+/** S4 采购闭环:合并 PR、转 DO/PO、写 QadTracking(替代旧 AutoTransferDoOrPo);租户由后端从登录态解析 */
+export function executeProcurementPipeline(mergeHistorical = true) {
 	return service
 		.post<ProcurementPipelineResult>('/api/Supply/procurement/execute-pipeline', null, {
-			params: { tenantId, createFromShortage: false, mergeHistorical },
+			params: { createFromShortage: false, mergeHistorical },
 		})
 		.then((r) => r.data);
 }

+ 1 - 11
Web/src/views/aidop/s3/supply/deliveryScheduleList.vue

@@ -148,7 +148,6 @@ import { useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import AidopDemoShell from '/@/views/aidop/components/AidopDemoShell.vue';
 import DeliveryScheduleBatchForm from './deliveryScheduleBatchForm.vue';
-import { useUserInfo } from '/@/stores/userInfo';
 import {
 	cancelDeliverySchedule,
 	executeProcurementPipeline,
@@ -164,7 +163,6 @@ import {
 } from '../api/deliverySchedule';
 
 const route = useRoute();
-const userInfo = useUserInfo();
 const pageTitle = computed(() => (route.meta?.title as string) || '物料交货计划');
 
 const query = reactive({
@@ -321,13 +319,6 @@ async function onGenerate() {
 	}
 }
 
-function currentTenantDomain(): string | undefined {
-	const u = userInfo.userInfos;
-	const tid = u?.currentTenantId ?? u?.tenantId;
-	if (tid === undefined || tid === null || String(tid).trim() === '') return undefined;
-	return String(tid);
-}
-
 async function onProcurementPipeline() {
 	try {
 		await ElMessageBox.confirm(
@@ -340,7 +331,7 @@ async function onProcurementPipeline() {
 	}
 	pipelining.value = true;
 	try {
-		const result = await executeProcurementPipeline(currentTenantDomain(), true);
+		const result = await executeProcurementPipeline(true);
 		const lines = [
 			result?.message,
 			result?.prMergeReducedCount != null ? `PR 合并减少:${result.prMergeReducedCount}` : null,
@@ -420,7 +411,6 @@ async function onSaveRules() {
 	savingRules.value = true;
 	try {
 		const snapshot = await saveS3DeliveryGenerateRule({
-			tenantId: 0,
 			factoryId: 0,
 			options: {
 				quotaRequiredTotal: ruleForm.quotaRequiredTotal,

+ 2 - 5
Web/src/views/aidop/s3/supply/purchaseOrderList.vue

@@ -39,7 +39,6 @@
 
 		<el-table :data="rows" v-loading="loading" border stripe style="width: 100%" @sort-change="onSortChange">
 			<el-table-column v-if="col.cgdd" prop="cgdd" label="采购单号" width="160" fixed="left" sortable="custom" />
-			<el-table-column v-if="col.sffb" prop="sffb" label="发布" width="110" fixed="left" sortable="custom" />
 			<el-table-column v-if="col.gysdm" prop="gysdm" label="供应商代码" width="120" sortable="custom" />
 			<el-table-column v-if="col.gysmc" prop="gysmc" label="供应商名称" min-width="150" show-overflow-tooltip sortable="custom" />
 			<el-table-column v-if="col.ddhh" prop="ddhh" label="采购单行号" width="110" sortable="custom" />
@@ -111,7 +110,6 @@ const col = reactive({
 	wjhsl: true,
 	jhrq: true,
 	th: true,
-	sffb: true,
 });
 
 type ColumnKey = keyof typeof col;
@@ -129,7 +127,6 @@ const toggleItems: Array<{ key: ColumnKey; label: string }> = [
 	{ key: 'wjhsl', label: '未收货数量' },
 	{ key: 'jhrq', label: '交货日期' },
 	{ key: 'th', label: '图号' },
-	{ key: 'sffb', label: '发布' },
 ];
 
 function fmtDate(v?: string | null) {
@@ -196,10 +193,10 @@ async function onExport() {
 			ElMessage.warning('没有可导出的数据');
 			return;
 		}
-		const headers = ['供应商代码', '供应商名称', '采购单号', '采购单行号', '采购组', '凭证日期', '物料编码', '物料描述', '订单类型', '订单数量', '未收货数量', '交货日期', '图号', '发布'];
+		const headers = ['供应商代码', '供应商名称', '采购单号', '采购单行号', '采购组', '凭证日期', '物料编码', '物料描述', '订单类型', '订单数量', '未收货数量', '交货日期', '图号'];
 		const lines = list.map((r: PurchaseOrderRow) => [
 			r.gysdm ?? '', r.gysmc ?? '', r.cgdd ?? '', r.ddhh ?? '', r.buyer ?? '', fmtDate(r.orddate), r.wlbm ?? '', r.wlms ?? '',
-			r.ddlx ?? '', r.jhdsl ?? '', r.wjhsl ?? '', fmtDate(r.jhrq), r.th ?? '', r.sffb ?? '',
+			r.ddlx ?? '', r.jhdsl ?? '', r.wjhsl ?? '', fmtDate(r.jhrq), r.th ?? '',
 		]);
 		const csv = [headers, ...lines]
 			.map((row) => row.map((v) => `"${String(v ?? '').replace(/"/g, '""')}"`).join(','))

+ 3 - 3
server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -11,9 +11,9 @@
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
     <Copyright>Admin.NET</Copyright>
     <Description>Admin.NET 通用权限开发平台</Description>
-    <AssemblyVersion>1.0.563</AssemblyVersion>
-    <FileVersion>1.0.563</FileVersion>
-    <Version>1.0.563</Version>
+    <AssemblyVersion>1.0.564</AssemblyVersion>
+    <FileVersion>1.0.564</FileVersion>
+    <Version>1.0.564</Version>
   </PropertyGroup>
 
   <ItemGroup>

+ 10 - 11
server/Plugins/Admin.NET.Plugin.AiDOP/Infrastructure/AidopActionRunLogQueryService.cs

@@ -2,10 +2,15 @@ using System.Text.Json;
 
 namespace Admin.NET.Plugin.AiDOP.Infrastructure;
 
-/// <summary>业务动作运行日志查询 API。</summary>
+/// <summary>
+/// 业务动作运行日志查询 API。
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> +
+/// <c>_userManager.TenantId &gt; 0</c> 否则回退宽松解析,未认证方可携带 <c>?tenantId=</c> 读任意租户日志)。
+/// </summary>
 [ApiDescriptionSettings(Order = 120, Description = "业务动作运行日志")]
 [Route("api/Aidop")]
-[AllowAnonymous]
 [NonUnify]
 public class AidopActionRunLogQueryService : IDynamicApiController, ITransient
 {
@@ -22,9 +27,7 @@ public class AidopActionRunLogQueryService : IDynamicApiController, ITransient
     [HttpGet("action-run-log/list")]
     public async Task<object> GetList([FromQuery] AidopActionRunLogListInput input)
     {
-        var tenantId = _userManager.TenantId > 0
-            ? _userManager.TenantId
-            : AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var page = input.Page <= 0 ? 1 : input.Page;
         var pageSize = input.PageSize <= 0 ? 20 : Math.Min(input.PageSize, 100);
         var offset = (page - 1) * pageSize;
@@ -92,9 +95,7 @@ public class AidopActionRunLogQueryService : IDynamicApiController, ITransient
     [HttpGet("action-run-log/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = _userManager.TenantId > 0
-            ? _userManager.TenantId
-            : AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         var row = (await _db.Ado.SqlQueryAsync<AidopActionRunLogListRow>(
             """
@@ -133,9 +134,7 @@ public class AidopActionRunLogQueryService : IDynamicApiController, ITransient
     [HttpGet("action-run-log/action-codes")]
     public async Task<object> GetActionCodes()
     {
-        var tenantId = _userManager.TenantId > 0
-            ? _userManager.TenantId
-            : AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var codes = await _db.Ado.SqlQueryAsync<string>(
             """
             SELECT DISTINCT action_code

+ 16 - 12
server/Plugins/Admin.NET.Plugin.AiDOP/Order/AsnShipperService.cs

@@ -6,10 +6,14 @@ using Admin.NET.Plugin.AiDOP.Universal;
 /// <summary>
 /// 订单发货服务 🚚
 /// 路由前缀:/api/Order/asnshipper/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时 TenantId=0 使租户过滤失效/查不到数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 280, Description = "订单发货")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class AsnShipperService : IDynamicApiController, ITransient
 {
@@ -38,7 +42,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/list")]
     public async Task<object> GetAsnShipperList([FromQuery] AsnShipperListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var conditions = new List<string>
         {
@@ -110,7 +114,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/{id}")]
     public async Task<object> GetAsnShipperDetail(int id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var master = await _masterRep.GetFirstAsync(u => u.RecID == id && u.TenantId == tenantId)
                      ?? throw Oops.Oh("发货单不存在");
 
@@ -186,6 +190,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     {
         var now = DateTime.Now;
         var user = _userManager.Account ?? "system";
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         // 验证明细行至少有一行数据
         if (input.Details == null || input.Details.Count == 0)
@@ -200,7 +205,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
             var shipId = input.Id;
             if (string.IsNullOrWhiteSpace(shipId))
             {
-                shipId = await GenerateShipIdAsync(_userManager.TenantId);
+                shipId = await GenerateShipIdAsync(tenantId);
             }
 
             var entity = new AsnShipperMaster
@@ -228,7 +233,6 @@ public class AsnShipperService : IDynamicApiController, ITransient
         else
         {
             // ── 编辑:参照 SysJobService.UpdateJobDetail ──
-            var tenantId = _userManager.TenantId;
             var entity = await _masterRep.GetFirstAsync(u => u.RecID == input.RecID.Value && u.TenantId == tenantId)
                          ?? throw Oops.Oh("发货单不存在");
 
@@ -258,7 +262,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
         List<AsnShipperDetailInput> details, string user, DateTime now, bool isNew)
     {
         var dbDetails = isNew ? new List<AsnShipperDetail>()
-            : await _detailRep.GetListAsync(u => u.AsnShipperRecID == masterRecId && u.TenantId == _userManager.TenantId);
+            : await _detailRep.GetListAsync(u => u.AsnShipperRecID == masterRecId && u.TenantId == AidopTenantScope.ResolveOrThrow(_userManager));
         var dbById = dbDetails.ToDictionary(u => u.RecID);
         var inputIds = new HashSet<int>(details.Where(d => d.RecID is > 0).Select(d => d.RecID!.Value));
 
@@ -332,7 +336,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     public async Task<object> DeleteAsnShipper([FromBody] AsnShipperDeleteInput input)
     {
         // 参照 SysJobService.DeleteJobDetail:先查再删
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var entity = await _masterRep.GetFirstAsync(u => u.RecID == input.RecID && u.TenantId == tenantId)
                      ?? throw Oops.Oh("发货单不存在");
 
@@ -353,7 +357,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/salesord/{ordNbr}/entries")]
     public async Task<object> GetSalesOrdEntries(string ordNbr)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         // 查询销售单主表,获取客户信息
         var order = await _db.Queryable<SeOrder>()
@@ -393,7 +397,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/options/salesords")]
     public async Task<object> GetSalesOrdOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "s.IsDeleted = 0 AND s.tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(keyword))
@@ -424,7 +428,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/options/customers")]
     public async Task<object> GetCustomerOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(keyword))
@@ -454,7 +458,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/options/departments")]
     public async Task<object> GetDepartmentOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(keyword))
@@ -484,7 +488,7 @@ public class AsnShipperService : IDynamicApiController, ITransient
     [HttpGet("asnshipper/options/locations")]
     public async Task<object> GetLocationOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "tenant_id = @TenantId AND IsActive = 1";
         if (!string.IsNullOrWhiteSpace(keyword))

+ 11 - 7
server/Plugins/Admin.NET.Plugin.AiDOP/Order/ContractReviewService.cs

@@ -4,10 +4,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// 合同评审服务 📋
 /// 路由前缀:/api/Order/contract/...
 /// 审批:由审批流插件(BizType=CONTRACT_REVIEW)+ 前端 ApprovalPanel 发起与办理;本服务仅保留列表/详情/保存/删除。
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时 TenantId=0 使租户过滤失效/查不到数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 250, Description = "合同评审")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class ContractReviewService : IDynamicApiController, ITransient
 {
@@ -36,7 +40,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
     [HttpGet("contract/list")]
     public async Task<object> GetContractReviewList([FromQuery] ContractReviewListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var conditions = new List<string> { "tenant_id = @TenantId" };
 
@@ -81,7 +85,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
     [HttpGet("contract/{id}")]
     public async Task<object> GetContractReviewDetail(int id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var review = await _reviewRep.GetFirstAsync(u => u.RecID == id && u.TenantId == tenantId)
                      ?? throw Oops.Oh("合同评审记录不存在");
 
@@ -154,7 +158,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
         if (string.IsNullOrWhiteSpace(input.Title))
             throw Oops.Oh("合同标题不能为空");
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         // 合同编号唯一性校验
         var existingId = input.RecID ?? 0;
@@ -254,7 +258,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
     public async Task<object> DeleteContractReview([FromBody] ContractReviewDeleteInput input)
     {
         // 参照 SysJobService.DeleteJobDetail:先查再删,同时删关联数据
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var entity = await _reviewRep.GetFirstAsync(u => u.RecID == input.RecID && u.TenantId == tenantId)
                      ?? throw Oops.Oh("合同评审记录不存在");
 
@@ -278,7 +282,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
         if (string.IsNullOrWhiteSpace(projectCode))
             return new { exists = false };
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var exists = await _reviewRep.IsAnyAsync(u =>
             u.ProjectCode == projectCode.Trim()
             && u.TenantId == tenantId
@@ -295,7 +299,7 @@ public class ContractReviewService : IDynamicApiController, ITransient
     [HttpGet("contract/responsible-users")]
     public async Task<List<object>> GetResponsibleUsers([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var conditions = new List<string> { "TenantId = @TenantId" };
 

+ 9 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/Order/LinkagePlanService.cs

@@ -7,10 +7,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 计划联动看板服务
 /// 路由前缀:/api/Order/linkageplan/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时 TenantId=0 与 NULL 比较失败导致查不到数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 250, Description = "计划联动看板")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class LinkagePlanService : IDynamicApiController, ITransient
 {
@@ -40,7 +44,7 @@ public class LinkagePlanService : IDynamicApiController, ITransient
     [HttpGet("linkageplan/list")]
     public async Task<object> GetLinkagePlanList([FromQuery] LinkagePlanListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var q = _db.Queryable<LinkagePlan>()
             .Where(u => u.TenantId == tenantId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.BillNo), u => u.BillNo != null && u.BillNo.Contains(input.BillNo!.Trim()))
@@ -103,7 +107,7 @@ public class LinkagePlanService : IDynamicApiController, ITransient
     [HttpGet("linkageplan/{id:long}")]
     public async Task<object> GetLinkagePlanDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var m = await _linkagePlanRep.GetFirstAsync(u => u.Id == id && u.TenantId == tenantId)
                 ?? throw Oops.Oh("计划联动记录不存在");
 
@@ -186,8 +190,8 @@ public class LinkagePlanService : IDynamicApiController, ITransient
             await PrepareNbrMasterTempAsync();
             await PrepareNbrDetailTempAsync();
 
-            // ── Step 1: 清空全部数据 ──
-            await _db.Ado.ExecuteCommandAsync("DELETE FROM LinkagePlan");
+            // ── Step 1: 只清空本租户数据(重算前清理;全表 DELETE 会误删其它租户看板数据)──
+            await _db.Ado.ExecuteCommandAsync("DELETE FROM LinkagePlan WHERE tenant_id = @TenantId", new SugarParameter("@TenantId", tenantId));
 
             // ── Step 2: 插入计划 + 实际数据(IGNORE 跳过重复主键) ──
             await _db.Ado.ExecuteCommandAsync("""

+ 9 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/Order/MdpMonitorService.cs

@@ -2,10 +2,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 
 /// <summary>
 /// 数据中台统一 MDP 运行监控。
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时退化为 <c>tenant_id = 0</c> 平台行)。租户行与平台行可见性语义(<c>BuildMdpRunLogTenantWhere</c>)不变。
 /// </summary>
 [ApiDescriptionSettings(Order = 322, Description = "统一MDP运行监控")]
 [Route("api/DataPlatform")]
-[AllowAnonymous]
 [NonUnify]
 public class MdpMonitorService : IDynamicApiController, ITransient
 {
@@ -74,7 +78,7 @@ public class MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("mdp-monitor/latest")]
     public async Task<object> GetLatest([FromQuery] MdpMonitorQueryInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var (whereSql, pars) = BuildWhere(input, tenantId);
         var row = await _db.Ado.SqlQuerySingleAsync<MdpMonitorRunLogRow>(
             $"""
@@ -94,7 +98,7 @@ public class MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("mdp-monitor/list")]
     public async Task<object> GetList([FromQuery] MdpMonitorListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var page = input.Page <= 0 ? 1 : input.Page;
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
@@ -121,7 +125,7 @@ public class MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("mdp-monitor/detail/{id}")]
     public async Task<object> GetDetail(long id, [FromQuery] MdpMonitorQueryInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var (whereSql, pars) = BuildWhere(input, tenantId);
         pars.Add(new SugarParameter("@Id", id));
 
@@ -143,7 +147,7 @@ public class MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("mdp-monitor/lineage")]
     public async Task<object> GetLineage([FromQuery] MdpMonitorLineageInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var moduleCode = ResolveModuleCode(input.ModuleCode, input.JobCode);
         if (string.IsNullOrWhiteSpace(moduleCode))
             throw Oops.Oh("请选择 MDP 模块");

+ 12 - 8
server/Plugins/Admin.NET.Plugin.AiDOP/Order/OrderDeliveryService.cs

@@ -3,6 +3,10 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 订单交付服务 📦
 /// 路由前缀:/api/Order/delivery/...
+///
+/// 【租户安全边界】需认证访问;租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:直接取 <c>_userManager.TenantId</c>,
+/// 无效租户时 TenantId=0 退化为查不到数据而非拒绝)。
 /// </summary>
 [ApiDescriptionSettings(Order = 270, Description = "订单交付")]
 [Route("api/Order")]
@@ -26,7 +30,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     [HttpGet("delivery/list")]
     public async Task<object> GetDeliveryList([FromQuery] OrderDeliveryListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var innerConditions = new List<string>
         {
@@ -166,7 +170,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     // ── 基础信息 ──
     private async Task<FlowBasicRow?> QueryBasic(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 IFNULL(e.item_number, '')  AS ItemNumber,
@@ -192,7 +196,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     // ── Tab1 订单信息 ──
     private async Task<FlowOrderInfoRow?> QueryOrderInfo(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 o.bill_no            AS BillNo,
@@ -223,7 +227,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     /// </remarks>
     private async Task<FlowReviewRow?> QueryReview(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 bce.satisfy_time AS SysCapacityDate,
@@ -254,7 +258,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     // ── Tab2 变更记录(MySQL:按订单行关联变更单)──
     private async Task<List<FlowChangeRow>> QueryChanges(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 ROW_NUMBER() OVER (ORDER BY c.create_time, c.Id) AS Sno,
@@ -306,7 +310,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     // ── Tab4 物料需求(MySQL:最新评审结果 + BOM 子件明细,同需求明细核验口径)──
     private async Task<List<FlowMaterialRow>> QueryMaterials(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 ROW_NUMBER() OVER (ORDER BY bce.id) AS Sno,
@@ -611,7 +615,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
               AND pr.sentry_id = @EntryId
             ORDER BY iqcjy.FAPPLYTIME DESC
             """;
-        return await _db.Ado.SqlQueryAsync<FlowIqcRow>(sql, new { EntryId = entryId, TenantId = _userManager.TenantId });
+        return await _db.Ado.SqlQueryAsync<FlowIqcRow>(sql, new { EntryId = entryId, TenantId = AidopTenantScope.ResolveOrThrow(_userManager) });
     }
 
     // ── Tab8 FQC信息 ──
@@ -689,7 +693,7 @@ public class OrderDeliveryService : IDynamicApiController, ITransient
     // ── Tab8 成品发运(与订单行 OrdNbr + 行物料一致)──
     private async Task<List<FlowShipmentRow>> QueryShipment(long entryId)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         const string sql = """
             SELECT
                 ROW_NUMBER() OVER (ORDER BY d.ShipDate DESC, d.RecID DESC) AS Sno,

+ 5 - 12
server/Plugins/Admin.NET.Plugin.AiDOP/Order/OrderReviewOrchestrationService.cs

@@ -156,9 +156,7 @@ public class OrderReviewOrchestrationService : ITransient
         if (orderIds is null || orderIds.Count == 0)
             throw Oops.Oh("至少选择一条订单");
 
-        var tenantId = _userManager.TenantId > 0
-            ? _userManager.TenantId
-            : AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = _userManager.Account ?? "system";
         var distinctIds = orderIds.Distinct().ToList();
 
@@ -229,7 +227,7 @@ public class OrderReviewOrchestrationService : ITransient
             await CleanupStaleReviewOccupyAsync(tenantId, _currentReviewBangId);
 
         if (actionCode == ActionReview && aggregate.ResourceCheckCount > 0)
-            aggregate.Warnings.AddRange(TryTriggerMdpRefresh());
+            aggregate.Warnings.AddRange(TryTriggerMdpRefresh(tenantId));
 
         return aggregate;
     }
@@ -239,9 +237,7 @@ public class OrderReviewOrchestrationService : ITransient
         long orderId,
         Func<OrderWorkOrderGenerationService.OrderHeader, SeOrderReviewExecuteResult, List<string>, string, Task> handler)
     {
-        var tenantId = _userManager.TenantId > 0
-            ? _userManager.TenantId
-            : AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = _userManager.Account ?? "system";
         var order = await LoadOrderAsync(orderId, tenantId)
             ?? throw Oops.Oh("订单不存在或不属于当前租户");
@@ -278,7 +274,7 @@ public class OrderReviewOrchestrationService : ITransient
                 await CleanupStaleReviewOccupyAsync(tenantId, _currentReviewBangId);
 
             if (actionCode == ActionRefresh && result.ResourceCheckCount > 0)
-                result.Warnings.AddRange(TryTriggerMdpRefresh());
+                result.Warnings.AddRange(TryTriggerMdpRefresh(tenantId));
 
             return result;
         }
@@ -723,11 +719,8 @@ public class OrderReviewOrchestrationService : ITransient
         return $"{r.Message},工单:{string.Join("、", r.WorkOrders.Distinct())}";
     }
 
-    private List<string> TryTriggerMdpRefresh()
+    private List<string> TryTriggerMdpRefresh(long tenantId)
     {
-        if (_userManager.TenantId <= 0)
-            return new List<string>();
-        var tenantId = _userManager.TenantId;
         var factoryId = 1L;
         _refreshDispatcher.Enqueue("S1", async (sp, ct) =>
         {

+ 14 - 12
server/Plugins/Admin.NET.Plugin.AiDOP/Order/ProductDesignService.cs

@@ -6,10 +6,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 产品设计服务(常规/非标;合同维度跟踪设计负责人、图号、BOM、工艺、图纸计划/实际时间)
 /// 路由前缀:/api/Order/productdesign/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时 TenantId=0 使租户过滤失效/查不到数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 255, Description = "产品设计")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class ProductDesignService : IDynamicApiController, ITransient
 {
@@ -37,7 +41,7 @@ public class ProductDesignService : IDynamicApiController, ITransient
     [HttpGet("productdesign/list")]
     public async Task<object> GetProductDesignList([FromQuery] ProductDesignListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var q = _db.Queryable<ProductDesign>()
             .Where(u => u.TenantId == tenantId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.BillNo), u => u.BillNo.Contains(input.BillNo!.Trim()))
@@ -77,7 +81,7 @@ public class ProductDesignService : IDynamicApiController, ITransient
     [HttpGet("productdesign/{id:long}")]
     public async Task<object> GetProductDesignDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var m = await _designRep.GetFirstAsync(u => u.Id == id && u.TenantId == tenantId)
                 ?? throw Oops.Oh("产品设计记录不存在");
 
@@ -162,7 +166,7 @@ public class ProductDesignService : IDynamicApiController, ITransient
 
         var now = DateTime.Now;
         var user = _userManager.Account ?? "system";
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         await _db.Ado.BeginTranAsync();
         try
@@ -211,7 +215,7 @@ public class ProductDesignService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "DeleteProductDesign"), HttpPost("productdesign/delete")]
     public async Task<object> DeleteProductDesign([FromBody] ProductDesignDeleteInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var entity = await _designRep.GetFirstAsync(u => u.Id == input.Id && u.TenantId == tenantId)
                      ?? throw Oops.Oh("产品设计记录不存在");
 
@@ -240,10 +244,8 @@ public class ProductDesignService : IDynamicApiController, ITransient
 
         // 🔴 租户硬门:本方法的两段裸 SQL 走 _db.Ado.SqlQueryAsync,**完全绕过** SqlSugar 的
         //    QueryFilter(后者只作用于 Queryable<T>),必须自己带 tenant_id。
-        //    且本控制器是 [AllowAnonymous],匿名请求下 SqlSugarSetup 的 ITenantIdFilter
-        //    根本不会注册(它要求 JWT 里有 TenantId claim),连兜底都没有。
-        //    tenantId 为 0(匿名/无 claim)时下面所有谓词都匹配不到行 —— fail-closed,符合预期。
-        var tenantId = _userManager.TenantId;
+        //    租户经 AidopTenantScope.ResolveOrThrow 严格解析(仅认证后 JWT),无有效租户直接拒绝。
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         // 查询图纸设计周期
         var drawingDesignCycle = await _db.Queryable<AdoS0ItemMaster>()
@@ -508,7 +510,7 @@ WHERE r.RoutingCode=@itemNum AND r.tenant_id=@tenantId ORDER BY r.Op";
     [HttpGet("productdesign/contract-options")]
     public async Task<List<object>> GetContractOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var sql = string.IsNullOrWhiteSpace(keyword)
             ? "SELECT BillNo, CONCAT(BillNo, ' | ', IFNULL(Title,'')) AS Label FROM ado_contract_review WHERE tenant_id = @tenantId ORDER BY RecID DESC LIMIT 50"
             : "SELECT BillNo, CONCAT(BillNo, ' | ', IFNULL(Title,'')) AS Label FROM ado_contract_review WHERE tenant_id = @tenantId AND (BillNo LIKE @kw OR Title LIKE @kw) ORDER BY RecID DESC LIMIT 50";
@@ -523,7 +525,7 @@ WHERE r.RoutingCode=@itemNum AND r.tenant_id=@tenantId ORDER BY r.Op";
     [HttpGet("productdesign/user-options")]
     public async Task<List<object>> GetUserOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var sql = string.IsNullOrWhiteSpace(keyword)
             ? "SELECT Id, Account, RealName FROM SysUser WHERE TenantId = @tenantId AND Status = 1 ORDER BY OrderNo LIMIT 200"
             : "SELECT Id, Account, RealName FROM SysUser WHERE TenantId = @tenantId AND Status = 1 AND (Account LIKE @kw OR RealName LIKE @kw) ORDER BY OrderNo LIMIT 200";
@@ -538,7 +540,7 @@ WHERE r.RoutingCode=@itemNum AND r.tenant_id=@tenantId ORDER BY r.Op";
     [HttpGet("productdesign/line-options")]
     public async Task<List<object>> GetLineOptions([FromQuery] string? keyword)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var sql = string.IsNullOrWhiteSpace(keyword)
             ? "SELECT Line, `Describe` FROM LineMaster WHERE tenant_id = @tenantId AND IsActive = 1 ORDER BY Line LIMIT 200"
             : "SELECT Line, `Describe` FROM LineMaster WHERE tenant_id = @tenantId AND IsActive = 1 AND (Line LIKE @kw OR `Describe` LIKE @kw) ORDER BY Line LIMIT 200";

+ 6 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Order/RequirementExamineDetailService.cs

@@ -3,10 +3,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 需求明细核验(资源检查运算明细,只读查询)
 /// 路由前缀:/api/Order/examine-detail/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=</c> 读任意租户需求明细核验数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 255, Description = "需求明细核验")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class RequirementExamineDetailService : IDynamicApiController, ITransient
 {
@@ -26,7 +30,7 @@ public class RequirementExamineDetailService : IDynamicApiController, ITransient
     [HttpGet("examine-detail/list")]
     public async Task<object> PageRequirementExamineDetail([FromQuery] RequirementExamineDetailListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = new List<string>
         {

+ 8 - 4
server/Plugins/Admin.NET.Plugin.AiDOP/Order/S1MdpMonitorService.cs

@@ -2,10 +2,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 
 /// <summary>
 /// S1 MDP 运行监控。
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时退化为 <c>tenant_id = 0</c> 平台行)。租户行与平台行可见性语义(<c>BuildMdpRunLogTenantWhere</c>)不变。
 /// </summary>
 [ApiDescriptionSettings(Order = 321, Description = "S1 MDP运行监控")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class S1MdpMonitorService : IDynamicApiController, ITransient
 {
@@ -23,7 +27,7 @@ public class S1MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("s1-mdp-monitor/latest")]
     public async Task<object> GetLatest()
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         return await _db.Ado.SqlQuerySingleAsync<S1MdpRunLogRow>(
             $"{SelectColumnsSql()} FROM mdp_transform_run_log WHERE job_code=@JobCode AND {MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId)} ORDER BY start_time DESC, id DESC LIMIT 1",
             new SugarParameter("@JobCode", JobCode),
@@ -35,7 +39,7 @@ public class S1MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("s1-mdp-monitor/list")]
     public async Task<object> GetList([FromQuery] S1MdpMonitorListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var page = input.Page <= 0 ? 1 : input.Page;
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
@@ -82,7 +86,7 @@ public class S1MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("s1-mdp-monitor/detail/{id}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = await _db.Ado.SqlQuerySingleAsync<S1MdpRunLogRow>(
             $"{SelectColumnsSql()} FROM mdp_transform_run_log WHERE id=@Id AND job_code=@JobCode AND {MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId)} LIMIT 1",
             new SugarParameter("@Id", id),

+ 13 - 8
server/Plugins/Admin.NET.Plugin.AiDOP/Order/SeOrderService.cs

@@ -5,6 +5,11 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 销售订单评审服务 🗂️
 /// 路由前缀:/api/Order/seorder/...
+///
+/// 【租户安全边界】需认证访问;租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:多处宽松解析
+/// <c>AidopTenantHelper.Resolve(App.HttpContext)</c> / 直接取 <c>_userManager.TenantId</c>,
+/// 可被 <c>?tenantId=</c> query 覆盖并有默认租户兜底)。
 /// </summary>
 [ApiDescriptionSettings(Order = 300, Description = "销售订单评审")]
 [Route("api/Order")]
@@ -45,7 +50,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     [HttpGet("seorder/list")]
     public async Task<object> GetSeOrderList([FromQuery] SeOrderListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var innerConditions = new List<string> { "o.IsDeleted = 0", "o.tenant_id = @TenantId" };
 
@@ -138,7 +143,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     [HttpGet("seorder/customers")]
     public async Task<object> GetCustomers([FromQuery] KeywordPageInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter>();
         var where = "tenant_id = @TenantId";
         pars.Add(new SugarParameter("@TenantId", tenantId));
@@ -167,7 +172,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     [HttpGet("seorder/items")]
     public async Task<object> GetItems([FromQuery] KeywordPageInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter>();
         var where = "IsDeleted = 0 AND tenant_id = @TenantId";
         pars.Add(new SugarParameter("@TenantId", tenantId));
@@ -244,7 +249,7 @@ public class SeOrderService : IDynamicApiController, ITransient
         if (input.Id is null or 0)
         {
             // ── 新增:参照 SysJobService.AddJobDetail ──
-            var tenantId = _userManager.TenantId;
+            var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
             // 如果未填写订单编号,自动生成:SO + yyyyMMdd + 4位流水号
             if (string.IsNullOrWhiteSpace(input.BillNo))
@@ -283,7 +288,7 @@ public class SeOrderService : IDynamicApiController, ITransient
         else
         {
             // ── 编辑:参照 SysJobService.UpdateJobDetail ──
-            var tenantId = _userManager.TenantId;
+            var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
             var entity = await _seOrderRep.GetFirstAsync(u => u.Id == input.Id.Value && u.IsDeleted == 0)
                          ?? throw Oops.Oh("订单不存在");
 
@@ -325,7 +330,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     /// </summary>
     private async Task SaveEntriesAsync(long orderId, string billNo, List<SeOrderEntryInput> entries)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         // 取 DB 现有明细,以 Id 为 key 建索引
         var dbEntries = await _seOrderEntryRep.GetListAsync(u => u.SeOrderId == orderId && u.IsDeleted == 0 && u.TenantId == tenantId);
         var dbById = dbEntries.ToDictionary(u => u.Id);
@@ -449,7 +454,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "CreateSeOrderChange"), HttpPost("seorder/{id}/change")]
     public async Task<object> CreateChange(long id, [FromBody] SeOrderChangeSaveInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         // 参照 SysJobService.AddJobDetail:Adapt → 设主键与审计字段 → InsertAsync
         var entity = input.Adapt<SeOrderChange>();
         entity.Id = YitIdHelper.NextId();
@@ -469,7 +474,7 @@ public class SeOrderService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "GetSeOrderChange"), HttpGet("seorder/{id}/change")]
     public async Task<object> GetChange(long id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var change = await _db.Ado.SqlQuerySingleAsync<SeOrderChange>(
             """
             SELECT * FROM crm_seorder_change

+ 9 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/Order/ShippingPlanService.cs

@@ -3,10 +3,14 @@ namespace Admin.NET.Plugin.AiDOP.Order;
 /// <summary>
 /// 出货计划服务 📦
 /// 路由前缀:/api/Order/shippingplan/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + 直接取 <c>_userManager.TenantId</c>,
+/// 匿名时 TenantId=0 使租户过滤失效/查不到数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 290, Description = "出货计划")]
 [Route("api/Order")]
-[AllowAnonymous]
 [NonUnify]
 public class ShippingPlanService : IDynamicApiController, ITransient
 {
@@ -41,7 +45,7 @@ public class ShippingPlanService : IDynamicApiController, ITransient
     [HttpGet("shippingplan/list")]
     public async Task<object> GetShippingPlanList([FromQuery] ShippingPlanListInput input)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var conditions = new List<string> { "a.tenant_id = @TenantId", "b.tenant_id = @TenantId" };
 
@@ -130,7 +134,7 @@ public class ShippingPlanService : IDynamicApiController, ITransient
     [HttpGet("shippingplan/{id}")]
     public async Task<object> GetShippingPlanDetail(int id)
     {
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var plan = await _planRep.GetFirstAsync(u => u.RecID == id && u.TenantId == tenantId)
                    ?? throw Oops.Oh("出货计划不存在");
 
@@ -177,7 +181,7 @@ public class ShippingPlanService : IDynamicApiController, ITransient
     {
         var now = DateTime.Now;
         var user = _userManager.Account ?? "system";
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         if (input.RecID is null or 0)
         {
@@ -319,7 +323,7 @@ public class ShippingPlanService : IDynamicApiController, ITransient
         if (ids.Count == 0)
             throw Oops.Oh("ids 不能为空");
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = _userManager.Account ?? "system";
         var now = DateTime.Now;
 

+ 8 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/ProcurementExecution/IqcReturnQueryService.cs

@@ -5,10 +5,16 @@ namespace Admin.NET.Plugin.AiDOP.ProcurementExecution;
 /// <summary>
 /// S4 IQC 退货查询(只读列表)。数据:qms_qcp_insappnentry + qms_qcp_inspecapplyn + qms_qcp_inspbill,可选 PurOrdDetail / SuppMaster。
 /// 路由:/api/ProcurementExecution/iqc-return/list
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + <c>AidopTenantHelper.Resolve(App.HttpContext)</c>
+/// (解析链含 query 参数 tenantId 与 DefaultTenantId 兜底),匿名携带 <c>?tenantId=&lt;任意租户&gt;</c> 可读回该租户 IQC 退货数据。
+/// </para>
 /// </summary>
 [ApiDescriptionSettings(Order = 322, Description = "S4 IQC退货查询")]
 [Route("api/ProcurementExecution")]
-[AllowAnonymous]
 [NonUnify]
 public class IqcReturnQueryService : IDynamicApiController, ITransient
 {
@@ -57,7 +63,7 @@ public class IqcReturnQueryService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var cond = new List<string> { ReturnClfsPredicate };
         var pars = new List<SugarParameter>();
 

+ 23 - 14
server/Plugins/Admin.NET.Plugin.AiDOP/ProcurementExecution/PurchaseReturnService.cs

@@ -7,10 +7,19 @@ namespace Admin.NET.Plugin.AiDOP.ProcurementExecution;
 /// <summary>
 /// S4 采购退货单(PurOrdRctMaster / PurOrdRctDetail,RctType=pt)
 /// 路由:/api/ProcurementExecution/purchase-return/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + 全类 <c>AidopTenantHelper.Resolve(App.HttpContext)</c>。
+/// 后者的解析顺序为 requestTenantId &gt; JWT claim &gt; <b>query 参数 tenantId</b> &gt; <b>DefaultTenantId 兜底</b>,
+/// 其自身注释即写明「允许前端指定租户且有默认回退,不得用于业务数据的查询与写入」。
+/// 两者叠加的后果:匿名(无 Token、无 Cookie)<c>?tenantId=&lt;任意租户&gt;</c> 即可读写该租户的采购退货单
+/// (含 purchase-return/save、purchase-return/delete 写端点)。
+/// </para>
 /// </summary>
 [ApiDescriptionSettings(Order = 321, Description = "S4采购退货单")]
 [Route("api/ProcurementExecution")]
-[AllowAnonymous]
 [NonUnify]
 public class PurchaseReturnService : IDynamicApiController, ITransient
 {
@@ -61,7 +70,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var cond = new List<string> { "p.RctType='pt'", "p.IsActive=1", "p.tenant_id = @TenantId" };
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         if (!string.IsNullOrWhiteSpace(input.Receiver))
@@ -129,7 +138,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpGet("purchase-return/options/suppliers")]
     public async Task<object> GetSuppliers()
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var rows = await _db.Ado.SqlQueryAsync<PurchaseReturnKvItem>(
             """
             SELECT Supp AS `Value`,
@@ -148,7 +157,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     {
         if (string.IsNullOrWhiteSpace(supp))
             return Array.Empty<object>();
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var rows = await _db.Ado.SqlQueryAsync<PurchaseReturnKvItem>(
             """
             SELECT p.Receiver AS `Value`,
@@ -183,7 +192,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     {
         if (string.IsNullOrWhiteSpace(receiver))
             throw Oops.Oh("请先选择收货单号");
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var rows = await _db.Ado.SqlQueryAsync<PurchaseReturnRcLineRow>(
             """
             SELECT
@@ -235,7 +244,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpGet("purchase-return/options/departments")]
     public async Task<object> GetDepartments()
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         return await _db.Ado.SqlQueryAsync<PurchaseReturnKvItem>(
             """
             SELECT Department AS `Value`,
@@ -251,7 +260,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpGet("purchase-return/options/locations")]
     public async Task<object> GetLocations()
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         return await _db.Ado.SqlQueryAsync<PurchaseReturnKvItem>(
             """
             SELECT Location AS `Value`,
@@ -267,7 +276,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpGet("purchase-return/options/qc-reasons")]
     public async Task<object> GetQcReasons()
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         return await _db.Ado.SqlQueryAsync<PurchaseReturnKvItem>(
             """
             SELECT Val AS `Value`,
@@ -289,7 +298,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
         var page = input.Page <= 0 ? 1 : input.Page;
         var pageSize = input.PageSize <= 0 ? 20 : input.PageSize;
         var offset = (page - 1) * pageSize;
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "1=1 AND tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(input.Keyword))
@@ -316,7 +325,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpGet("purchase-return/{id:int}")]
     public async Task<object> GetDetail(int id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var master = await _masterRep.GetFirstAsync(m => m.RecID == id && m.RctType == "pt" && m.TenantId == tenantId)
                      ?? throw Oops.Oh("单据不存在");
 
@@ -403,7 +412,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
 
         var now = DateTime.Now;
         var account = _userManager.Account ?? "system";
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         var domain = string.IsNullOrWhiteSpace(input.Domain)
             ? await ResolveRcDomainAsync(input.OrdNbr.Trim())
@@ -501,7 +510,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
         string account,
         DateTime now)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var dbRows = await _detailRep.GetListAsync(d =>
             d.PurOrdRctRecID == masterRecId && d.RctType == rctType && d.TenantId == tenantId);
         var dbById = dbRows.ToDictionary(d => d.RecID);
@@ -597,7 +606,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
     [HttpPost("purchase-return/delete/{id:int}")]
     public async Task<object> SoftDelete(int id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var m = await _masterRep.GetFirstAsync(x => x.RecID == id && x.RctType == "pt" && x.TenantId == tenantId)
                 ?? throw Oops.Oh("单据不存在");
         if (!m.IsPlan)
@@ -620,7 +629,7 @@ public class PurchaseReturnService : IDynamicApiController, ITransient
 
     private async Task<string> ResolveRcDomainAsync(string rcReceiver)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var d = await _db.Ado.GetStringAsync(
             "SELECT Domain FROM PurOrdRctMaster WHERE RctType='rc' AND Receiver=@R AND tenant_id=@TenantId LIMIT 1",
             new SugarParameter("@R", rcReceiver),

+ 7 - 4
server/Plugins/Admin.NET.Plugin.AiDOP/Production/ExecutableDailyPlanService.cs

@@ -3,10 +3,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 可执行生产日计划(PeriodSequenceDet + 排产/工单等)
 /// 路由前缀:/api/Production/daily-plan/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 266, Description = "可执行生产日计划")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class ExecutableDailyPlanService : IDynamicApiController, ITransient
 {
@@ -43,7 +46,7 @@ public class ExecutableDailyPlanService : IDynamicApiController, ITransient
     [HttpGet("daily-plan/list")]
     public async Task<object> GetList([FromQuery] ExecutableDailyPlanListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
 
         var innerWhere = new List<string>
@@ -154,7 +157,7 @@ public class ExecutableDailyPlanService : IDynamicApiController, ITransient
 
         var account = _userManager.Account ?? "system";
         var now = DateTime.Now;
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         if (tenantId <= 0)
             throw Oops.Oh("无法确定当前租户,日计划下达已拒绝");   // fail closed,绝不按默认租户写业务状态
         const string releasedFlag = "Y";
@@ -302,7 +305,7 @@ public class ExecutableDailyPlanService : IDynamicApiController, ITransient
         if (st is not ("w" or "r" or "c" or "p"))
             throw Oops.Oh("状态不合法");
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             $"""
             UPDATE WorkOrdMaster

+ 8 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/Production/HolidayMasterService.cs

@@ -3,10 +3,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 产线节假日(HolidayMaster)
 /// 路由前缀:/api/Production/holiday/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 269, Description = "产线节假日")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class HolidayMasterService : IDynamicApiController, ITransient
 {
@@ -23,7 +26,7 @@ public class HolidayMasterService : IDynamicApiController, ITransient
     [HttpGet("holiday/list")]
     public async Task<object> GetList([FromQuery] HolidayMasterListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "h.IsActive = 1 AND h.tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(input.HolidayType))
@@ -58,7 +61,7 @@ public class HolidayMasterService : IDynamicApiController, ITransient
     [HttpGet("holiday/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = (await _db.Ado.SqlQueryAsync<HolidayDetailRow>(
             """
             SELECT RecID AS Id, Holiday, Dated, Ufld1, `Domain`, Site
@@ -74,7 +77,7 @@ public class HolidayMasterService : IDynamicApiController, ITransient
     [HttpPost("holiday/save")]
     public async Task<object> Save([FromBody] HolidayMasterSaveInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = Truncate8(_userManager.Account ?? "system");
         var now = DateTime.Now;
         var holiday = Truncate(input.Holiday.Trim(), 8);
@@ -163,7 +166,7 @@ public class HolidayMasterService : IDynamicApiController, ITransient
     [HttpPost("holiday/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             "UPDATE HolidayMaster SET IsActive = 0, UpdateTime = @Now WHERE RecID = @Id AND tenant_id = @TenantId",
             new List<SugarParameter> { new("@Id", id), new("@Now", DateTime.Now), new("@TenantId", tenantId) });

+ 16 - 7
server/Plugins/Admin.NET.Plugin.AiDOP/Production/ProductionSchedulingActionService.cs

@@ -9,10 +9,19 @@ using Microsoft.Extensions.Logging;
 
 namespace Admin.NET.Plugin.AiDOP.Production;
 
-/// <summary>工单排产动作:生成排程、优先级调整并重检。</summary>
+/// <summary>
+/// 工单排产动作:生成排程、优先级调整并重检。
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId/domain、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + <c>AidopTenantHelper.Resolve(App.HttpContext)</c> 宽松解析
+/// (解析链含 query 参数 tenantId 与 DefaultTenantId 兜底),且 <c>ResolveTenantId</c> 还接受前端直传 domain
+/// 数字直接充当租户 ID。叠加后果:未认证方可指定任意租户触发生产排程等写操作。
+/// </para>
+/// </summary>
 [ApiDescriptionSettings(Order = 264, Description = "工单排产动作")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class ProductionSchedulingActionService : IDynamicApiController, ITransient
 {
@@ -67,7 +76,7 @@ public class ProductionSchedulingActionService : IDynamicApiController, ITransie
     [HttpGet("scheduling/generate-status")]
     public async Task<object> GetGenerateStatus([FromQuery] long runId)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = (await _db.Ado.SqlQueryAsync<ScheduleRunStatusRow>(
             """
             SELECT id AS Id, status AS Status, message AS Message, detail_json AS DetailJson,
@@ -201,7 +210,7 @@ public class ProductionSchedulingActionService : IDynamicApiController, ITransie
     [HttpPost("scheduling/update-priority-and-recheck")]
     public async Task<object> UpdatePriorityAndRecheck([FromBody] WorkOrderPriorityRecheckInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = string.IsNullOrWhiteSpace(input.UserAccount)
             ? (_userManager.Account ?? "system")
             : input.UserAccount.Trim();
@@ -364,9 +373,9 @@ public class ProductionSchedulingActionService : IDynamicApiController, ITransie
 
     private long ResolveTenantId(string? domain)
     {
-        if (!string.IsNullOrWhiteSpace(domain) && long.TryParse(domain.Trim(), out var tid) && tid > 0)
-            return tid;
-        return AidopTenantHelper.Resolve(App.HttpContext);
+        // 租户只信 JWT:不再从前端直传的 domain 数字解析(那是让调用方自选租户),
+        // domain 仅作为公司域业务参数向下传递。
+        return AidopTenantScope.ResolveOrThrow(_userManager);
     }
 
     /// <summary>

+ 9 - 6
server/Plugins/Admin.NET.Plugin.AiDOP/Production/QualityLineWorkDetailService.cs

@@ -3,10 +3,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 产线休息时间(QualityLineWorkDetail)
 /// 路由前缀:/api/Production/line-rest/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 268, Description = "产线休息时间")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class QualityLineWorkDetailService : IDynamicApiController, ITransient
 {
@@ -23,7 +26,7 @@ public class QualityLineWorkDetailService : IDynamicApiController, ITransient
     [HttpGet("line-rest/list")]
     public async Task<object> GetList([FromQuery] QualityLineRestListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "qd.IsActive = 1 AND qd.tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(input.ProdLine))
@@ -67,7 +70,7 @@ public class QualityLineWorkDetailService : IDynamicApiController, ITransient
     [HttpGet("line-rest/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = (await _db.Ado.SqlQueryAsync<QualityLineRestDetailRow>(
             """
             SELECT RecID AS Id, `Domain`, Site, ProdLine, WorkShift, Line, RestTimePoint, RestTime,
@@ -95,7 +98,7 @@ public class QualityLineWorkDetailService : IDynamicApiController, ITransient
         const string defaultWorkShift = "-";
         const string defaultEnd = "2999-12-31";
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         // 同一产线 + 相同休息开始时间 重复校验(编辑时排除自身)
         var dupWhere = "ProdLine = @ProdLine AND RestTimePoint = @RestTimePoint AND IsActive = 1 AND tenant_id = @TenantId";
@@ -183,7 +186,7 @@ public class QualityLineWorkDetailService : IDynamicApiController, ITransient
     [HttpPost("line-rest/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             "UPDATE QualityLineWorkDetail SET IsActive = 0, UpdateTime = @Now WHERE RecID = @Id AND tenant_id = @TenantId",
             new List<SugarParameter> { new("@Id", id), new("@Now", DateTime.Now), new("@TenantId", tenantId) });
@@ -196,7 +199,7 @@ public class QualityLineWorkDetailService : IDynamicApiController, ITransient
     [HttpGet("line-rest/lines")]
     public async Task<object> GetLines([FromQuery] string? domain)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "IsActive = 1 AND tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(domain))

+ 9 - 6
server/Plugins/Admin.NET.Plugin.AiDOP/Production/ResourceOvertimeService.cs

@@ -3,10 +3,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 产线加班(ResourceOccupancyTime)
 /// 路由前缀:/api/Production/overtime/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 270, Description = "产线加班")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class ResourceOvertimeService : IDynamicApiController, ITransient
 {
@@ -23,7 +26,7 @@ public class ResourceOvertimeService : IDynamicApiController, ITransient
     [HttpGet("overtime/list")]
     public async Task<object> GetList([FromQuery] ResourceOvertimeListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "r.IsActive = 1 AND r.tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(input.Resource))
@@ -88,7 +91,7 @@ public class ResourceOvertimeService : IDynamicApiController, ITransient
     [HttpGet("overtime/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = (await _db.Ado.SqlQueryAsync<ResourceOvertimeDetailRow>(
             """
             SELECT RecID AS Id, `Domain`, Site, ResourceType, Resource, StartTime, EndTime, Descr,
@@ -118,7 +121,7 @@ public class ResourceOvertimeService : IDynamicApiController, ITransient
         var ufld1Hours = input.WorkMinutes.HasValue ? input.WorkMinutes.Value / 60m : (decimal?)null;
         var ufld2Hours = input.RestMinutes.HasValue ? input.RestMinutes.Value / 60m : (decimal?)null;
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         if (input.Id is null or 0)
         {
@@ -195,7 +198,7 @@ public class ResourceOvertimeService : IDynamicApiController, ITransient
     [HttpPost("overtime/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             "UPDATE ResourceOccupancyTime SET IsActive = 0, UpdateTime = @Now WHERE RecID = @Id AND tenant_id = @TenantId",
             new List<SugarParameter> { new("@Id", id), new("@Now", DateTime.Now), new("@TenantId", tenantId) });
@@ -208,7 +211,7 @@ public class ResourceOvertimeService : IDynamicApiController, ITransient
     [HttpGet("overtime/lines")]
     public async Task<object> GetLines([FromQuery] string? domain)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "IsActive = 1 AND tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(domain))

+ 8 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/Production/ScheduleExceptionService.cs

@@ -5,10 +5,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 排产异常记录服务 🏭
 /// 路由前缀:/api/Production/schedule-exception/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 267, Description = "排产异常记录")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class ScheduleExceptionService : IDynamicApiController, ITransient
 {
@@ -33,7 +36,7 @@ public class ScheduleExceptionService : IDynamicApiController, ITransient
     [HttpGet("schedule-exception/list")]
     public async Task<object> GetList([FromQuery] ScheduleExceptionListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var inner = new List<string> { "sm.tenant_id = @TenantId" };
 
@@ -92,7 +95,7 @@ public class ScheduleExceptionService : IDynamicApiController, ITransient
     [HttpGet("schedule-exception/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var e = await _rep.GetFirstAsync(u => u.RecID == id && u.TenantId == tenantId)
                 ?? throw Oops.Oh("记录不存在");
         return new
@@ -116,7 +119,7 @@ public class ScheduleExceptionService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "SaveScheduleException"), HttpPost("schedule-exception/save")]
     public async Task<object> Save([FromBody] ScheduleExceptionSaveInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         if (input.Id is null or 0)
         {
             var entity = new ScheduleExceptionMaster
@@ -156,7 +159,7 @@ public class ScheduleExceptionService : IDynamicApiController, ITransient
     [HttpPost("schedule-exception/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             "DELETE FROM ScheduleExceptionMaster WHERE RecID = @Id AND tenant_id = @TenantId",
             new List<SugarParameter> { new("@Id", id), new("@TenantId", tenantId) });

+ 9 - 6
server/Plugins/Admin.NET.Plugin.AiDOP/Production/ShopCalendarWorkCtrService.cs

@@ -3,10 +3,13 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 产线工作日历(ShopCalendarWorkCtr)
 /// 路由前缀:/api/Production/shop-calendar/...
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 读写该租户数据)。
 /// </summary>
 [ApiDescriptionSettings(Order = 267, Description = "产线工作日历")]
 [Route("api/Production")]
-[AllowAnonymous]
 [NonUnify]
 public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
 {
@@ -23,7 +26,7 @@ public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
     [HttpGet("shop-calendar/list")]
     public async Task<object> GetList([FromQuery] ShopCalendarWorkCtrListInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "sc.IsActive = 1 AND sc.tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(input.ProdLine))
@@ -74,7 +77,7 @@ public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
     [HttpGet("shop-calendar/lines")]
     public async Task<object> GetLines([FromQuery] string? domain)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = "IsActive = 1 AND tenant_id = @TenantId";
         if (!string.IsNullOrWhiteSpace(domain))
@@ -91,7 +94,7 @@ public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
     [HttpGet("shop-calendar/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var row = (await _db.Ado.SqlQueryAsync<ShopCalendarDetailRow>(
             """
             SELECT RecID AS Id, ProdLine, WeekDay, ShiftsStart1, ShiftsHours1, ShiftsStart2, ShiftsHours2,
@@ -126,7 +129,7 @@ public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
         var h1 = input.ShiftsHours1 ?? 0m;
         var h2 = input.ShiftsHours2 ?? 0m;
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
 
         if (input.Id is null or 0)
         {
@@ -226,7 +229,7 @@ public class ShopCalendarWorkCtrService : IDynamicApiController, ITransient
     [HttpPost("shop-calendar/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var n = await _db.Ado.ExecuteCommandAsync(
             "UPDATE ShopCalendarWorkCtr SET IsActive = 0, UpdateTime = @Now WHERE RecID = @Id AND tenant_id = @TenantId",
             new List<SugarParameter> { new("@Id", id), new("@Now", DateTime.Now), new("@TenantId", tenantId) });

+ 5 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Production/WorkOrderProgressDashboardService.cs

@@ -3,6 +3,10 @@ namespace Admin.NET.Plugin.AiDOP.Production;
 /// <summary>
 /// 工单执行进度看板(列表)📊
 /// 路由前缀:<c>/api/Production/work-order-progress/...</c>
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:宽松解析 <c>AidopTenantHelper.Resolve</c>,
+/// 可被 <c>?tenantId=</c> query 覆盖并有默认租户兜底)。
 /// </summary>
 [ApiDescriptionSettings(Order = 266, Description = "工单执行进度看板")]
 [Route("api/Production")]
@@ -24,7 +28,7 @@ public class WorkOrderProgressDashboardService : IDynamicApiController, ITransie
     public async Task<object> GetList([FromQuery] WorkOrderProgressDashboardListInput input)
     {
         const string C = "utf8mb4_general_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>

+ 77 - 55
server/Plugins/Admin.NET.Plugin.AiDOP/Production/WorkOrderSchedulingService.cs

@@ -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>
         {

+ 10 - 3
server/Plugins/Admin.NET.Plugin.AiDOP/Rule/RuleConfigQueryService.cs

@@ -2,10 +2,14 @@ namespace Admin.NET.Plugin.AiDOP.Rule;
 
 /// <summary>
 /// 规则配置只读查询接口。研发阶段首版只开放 S3 / DELIVERY_GENERATE。
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId、无默认回退(原实现:类级匿名 + <c>input.TenantId</c> 直传优先,
+/// 未认证方可读/改任意租户规则)。
 /// </summary>
 [ApiDescriptionSettings(Order = 330, Description = "规则配置查询")]
 [Route("api/RuleConfig")]
-[AllowAnonymous]
 [NonUnify]
 public class RuleConfigQueryService : IDynamicApiController, ITransient
 {
@@ -32,7 +36,7 @@ public class RuleConfigQueryService : IDynamicApiController, ITransient
             throw Oops.Oh("当前只支持查询 S3 / DELIVERY_GENERATE 规则配置");
         }
 
-        var tenantId = input.TenantId > 0 ? input.TenantId : _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var factoryId = input.FactoryId > 0 ? input.FactoryId : null;
         return await _ruleConfigService.ResolveS3DeliveryGenerateSnapshotAsync(tenantId, factoryId);
     }
@@ -41,7 +45,7 @@ public class RuleConfigQueryService : IDynamicApiController, ITransient
     [HttpPost("s3-delivery-generate/save")]
     public async Task<object> SaveS3DeliveryGenerate([FromBody] S3DeliveryGenerateRuleSaveInput input)
     {
-        var tenantId = input.TenantId > 0 ? input.TenantId : 0;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var factoryId = input.FactoryId > 0 ? input.FactoryId.Value : 0;
         var profile = (await _db.Ado.SqlQueryAsync<RuleProfileIdRow>(
             """
@@ -158,12 +162,15 @@ public sealed class RuleConfigQueryInput
 {
     public string? ModuleCode { get; set; }
     public string? ScenarioCode { get; set; }
+
+    /// <summary>已废弃:租户一律由认证后 JWT 解析,本字段不再参与租户判定。</summary>
     public long TenantId { get; set; }
     public long? FactoryId { get; set; }
 }
 
 public sealed class S3DeliveryGenerateRuleSaveInput
 {
+    /// <summary>已废弃:租户一律由认证后 JWT 解析,本字段不再参与租户判定。</summary>
     public long TenantId { get; set; }
     public long? FactoryId { get; set; }
     public S3DeliveryGenerateRuleOptionsInput Options { get; set; } = new();

+ 7 - 9
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DeliveryExceptionService.cs

@@ -2,10 +2,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 交货单异常记录服务
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> +
+/// <c>_userManager.TenantId &gt; 0</c> 跳过分支,匿名时 TenantId=0 使租户过滤整体失效)。
 /// </summary>
 [ApiDescriptionSettings(Order = 307, Description = "交货单异常记录")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class DeliveryExceptionService : IDynamicApiController, ITransient
 {
@@ -28,14 +31,9 @@ public class DeliveryExceptionService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 20 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var pars = new List<SugarParameter>();
-        var where = new List<string> { "1=1" };
-
-        if (_userManager.TenantId > 0)
-        {
-            where.Add("dm.tenant_id = @TenantId");
-            pars.Add(new SugarParameter("@TenantId", _userManager.TenantId));
-        }
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
+        var where = new List<string> { "1=1", "dm.tenant_id = @TenantId" };
         if (!string.IsNullOrWhiteSpace(input.OptTime))
         {
             where.Add($"(CAST(dm.OptTime AS CHAR(50)) COLLATE {C}) LIKE @OptTimeLike");

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DeliveryScheduleService.cs

@@ -6,10 +6,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 物料交货计划服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 306, Description = "物料交货计划")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class DeliveryScheduleService : IDynamicApiController, ITransient
 {

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DemandOrderService.cs

@@ -2,10 +2,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 要货令服务(PurOrdMaster/PurOrdDetail,Potype=PO,ReqBy=DO)
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 311, Description = "要货令")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class DemandOrderService : IDynamicApiController, ITransient
 {

+ 28 - 27
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/DemandScheduleService.cs

@@ -4,10 +4,17 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 物料需求计划服务
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + 多处以 <c>_userManager.TenantId</c> 拼接条件
+/// (<c>if (TenantId > 0)</c> / <c>tenantId <= 0 ||</c> 跳过形态)。匿名请求下 TenantId=0,
+/// 租户过滤整体被跳过,等价于未认证可跨租户读/软删/发布需求计划。
+/// </para>
 /// </summary>
 [ApiDescriptionSettings(Order = 305, Description = "物料需求计划")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class DemandScheduleService : IDynamicApiController, ITransient
 {
@@ -33,18 +40,14 @@ public class DemandScheduleService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var pars = new List<SugarParameter>();
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = new List<string>
         {
             "(a.ishistoryversion = 'N' OR a.ishistoryversion IS NULL)",
-            "IFNULL(a.IsDeleted,0)=0"
+            "IFNULL(a.IsDeleted,0)=0",
+            "a.tenant_id = @TenantId"
         };
-
-        if (_userManager.TenantId > 0)
-        {
-            where.Add("a.tenant_id = @TenantId");
-            pars.Add(new SugarParameter("@TenantId", _userManager.TenantId));
-        }
         if (!string.IsNullOrWhiteSpace(input.ItemNum))
         {
             where.Add("a.itemnum LIKE @ItemNum");
@@ -105,8 +108,8 @@ public class DemandScheduleService : IDynamicApiController, ITransient
     [HttpGet("demand-schedule/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
-        var row = await _rep.GetFirstAsync(x => x.Id == id && (x.IsDeleted == null || x.IsDeleted == 0) && (tenantId <= 0 || x.TenantId == tenantId));
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var row = await _rep.GetFirstAsync(x => x.Id == id && (x.IsDeleted == null || x.IsDeleted == 0) && x.TenantId == tenantId);
         if (row == null) throw Oops.Oh("记录不存在");
         return row;
     }
@@ -122,13 +125,14 @@ public class DemandScheduleService : IDynamicApiController, ITransient
 
         if (input.Id is null or 0)
         {
+            var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
             var entity = input.Adapt<DemandSchedule>();
             entity.Id = YitIdHelper.NextId();
             entity.ItemNum = input.ItemNum?.Trim();
             entity.IsHistoryVersion = null;
             entity.Status ??= string.Empty;
             entity.IsDeleted ??= 0;
-            entity.TenantId ??= _userManager.TenantId;
+            entity.TenantId = tenantId;
             entity.CompanyId ??= 1000;
             entity.CreateBy = _userManager.UserId;
             entity.CreateByName = _userManager.Account;
@@ -143,8 +147,8 @@ public class DemandScheduleService : IDynamicApiController, ITransient
         }
         else
         {
-            var tenantId = _userManager.TenantId;
-            var entity = await _rep.GetFirstAsync(x => x.Id == input.Id.Value && (x.IsDeleted == null || x.IsDeleted == 0) && (tenantId <= 0 || x.TenantId == tenantId))
+            var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+            var entity = await _rep.GetFirstAsync(x => x.Id == input.Id.Value && (x.IsDeleted == null || x.IsDeleted == 0) && x.TenantId == tenantId)
                          ?? throw Oops.Oh("记录不存在");
 
             entity.ItemNum = input.ItemNum?.Trim();
@@ -172,8 +176,8 @@ public class DemandScheduleService : IDynamicApiController, ITransient
     [HttpPost("demand-schedule/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = _userManager.TenantId;
-        var entity = await _rep.GetFirstAsync(x => x.Id == id && (x.IsDeleted == null || x.IsDeleted == 0) && (tenantId <= 0 || x.TenantId == tenantId))
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var entity = await _rep.GetFirstAsync(x => x.Id == id && (x.IsDeleted == null || x.IsDeleted == 0) && x.TenantId == tenantId)
                      ?? throw Oops.Oh("记录不存在");
 
         entity.IsDeleted = 1;
@@ -191,7 +195,7 @@ public class DemandScheduleService : IDynamicApiController, ITransient
         var ids = ParseIds(input.Ids);
         if (!ids.Any()) throw Oops.Oh("请选择要发布的数据");
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var affected = await _db.Updateable<DemandSchedule>()
             .SetColumns(x => new DemandSchedule
             {
@@ -200,7 +204,7 @@ public class DemandScheduleService : IDynamicApiController, ITransient
                 UpdateByName = _userManager.Account,
                 UpdateTime = DateTime.Now
             })
-            .Where(x => ids.Contains(x.Id) && (x.IsDeleted == null || x.IsDeleted == 0) && (x.Status == null || x.Status == "") && (tenantId <= 0 || x.TenantId == tenantId))
+            .Where(x => ids.Contains(x.Id) && (x.IsDeleted == null || x.IsDeleted == 0) && (x.Status == null || x.Status == "") && x.TenantId == tenantId)
             .ExecuteCommandAsync();
         return new { affected, message = affected > 0 ? "发布成功" : "无可发布数据" };
     }
@@ -209,7 +213,8 @@ public class DemandScheduleService : IDynamicApiController, ITransient
     [HttpPost("demand-schedule/publish-all")]
     public async Task<object> PublishAll()
     {
-        var query = _db.Updateable<DemandSchedule>()
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var affected = await _db.Updateable<DemandSchedule>()
             .SetColumns(x => new DemandSchedule
             {
                 Status = "P",
@@ -217,12 +222,8 @@ public class DemandScheduleService : IDynamicApiController, ITransient
                 UpdateByName = _userManager.Account,
                 UpdateTime = DateTime.Now
             })
-            .Where(x => (x.IsDeleted == null || x.IsDeleted == 0) && (x.Status == null || x.Status == ""));
-
-        if (_userManager.TenantId > 0)
-            query = query.Where(x => x.TenantId == _userManager.TenantId);
-
-        var affected = await query.ExecuteCommandAsync();
+            .Where(x => (x.IsDeleted == null || x.IsDeleted == 0) && (x.Status == null || x.Status == "") && x.TenantId == tenantId)
+            .ExecuteCommandAsync();
         return new { affected, message = affected > 0 ? "全部发布成功" : "无可发布数据" };
     }
 
@@ -233,7 +234,7 @@ public class DemandScheduleService : IDynamicApiController, ITransient
         var ids = ParseIds(input.Ids);
         if (!ids.Any()) throw Oops.Oh("请选择要取消发布的数据");
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var affected = await _db.Updateable<DemandSchedule>()
             .SetColumns(x => new DemandSchedule
             {
@@ -242,7 +243,7 @@ public class DemandScheduleService : IDynamicApiController, ITransient
                 UpdateByName = _userManager.Account,
                 UpdateTime = DateTime.Now
             })
-            .Where(x => ids.Contains(x.Id) && (x.IsDeleted == null || x.IsDeleted == 0) && x.Status == "P" && (tenantId <= 0 || x.TenantId == tenantId))
+            .Where(x => ids.Contains(x.Id) && (x.IsDeleted == null || x.IsDeleted == 0) && x.Status == "P" && x.TenantId == tenantId)
             .ExecuteCommandAsync();
         return new { affected, message = affected > 0 ? "取消发布成功" : "无可取消发布数据" };
     }

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/OutsourceOrderService.cs

@@ -2,10 +2,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 委外加工订单服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 310, Description = "委外加工订单")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class OutsourceOrderService : IDynamicApiController, ITransient
 {

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/ProcessOutsourceOrderService.cs

@@ -2,10 +2,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 工序外协订单服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 311, Description = "工序外协订单")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class ProcessOutsourceOrderService : IDynamicApiController, ITransient
 {

+ 19 - 12
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/ProcurementPipelineService.cs

@@ -10,10 +10,18 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 /// <summary>
 /// S4 采购执行闭环:缺料生成 PR → 合并 → 要货令转 DO/PO → 外部推送日志。
 /// 对应旧系统 AutoTransferDoOrPo / AutomaticPrAdjustDate 业务意图。
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + <c>[FromQuery] long tenantId = 0</c> 直传租户
+/// (为 0 时再回退宽松解析 <c>AidopTenantHelper.Resolve(App.HttpContext)</c>,其解析链含 query 参数 tenantId
+/// 与 DefaultTenantId 兜底)。叠加后果:未认证方可携带 <c>?tenantId=&lt;任意租户&gt;</c> 触发该租户的
+/// 采购管线写操作(生成/合并/软删 PR、转 DO/PO)。
+/// </para>
 /// </summary>
 [ApiDescriptionSettings(Order = 309, Description = "采购执行闭环")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class ProcurementPipelineService : IDynamicApiController, ITransient
 {
@@ -59,13 +67,11 @@ public class ProcurementPipelineService : IDynamicApiController, ITransient
     [DisplayName("采购执行闭环")]
     [HttpPost("procurement/execute-pipeline")]
     public async Task<ProcurementPipelineResult> ExecutePipeline(
-        [FromQuery] long tenantId = 0,
         [FromQuery] bool createFromShortage = true,
         [FromQuery] bool mergeHistorical = true,
         [FromQuery] bool enableExternalPush = true)
     {
-        if (tenantId <= 0)
-            tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var account = _userManager.Account ?? "system";
         var logId = await _runLog.StartAsync("S4_PROCUREMENT_PIPELINE", tenantId, "tenant", tenantId, tenantId.ToString());
 
@@ -73,7 +79,7 @@ public class ProcurementPipelineService : IDynamicApiController, ITransient
         {
             var result = await ExecuteCoreAsync(tenantId, account, createFromShortage, mergeHistorical, enableExternalPush);
             result.ReadPathConsistency = await _readPathCheck.CheckTenantAsync(tenantId);
-            result.Warnings.AddRange(TryTriggerS4MdpRefresh(result));
+            result.Warnings.AddRange(TryTriggerS4MdpRefresh(tenantId, result));
             await _runLog.SuccessAsync(logId, result.Message, result);
             return result;
         }
@@ -87,10 +93,9 @@ public class ProcurementPipelineService : IDynamicApiController, ITransient
     /// <summary>S4 读路径一致性检查(运行表 vs DWD)。</summary>
     [DisplayName("S4读路径一致性检查")]
     [HttpGet("procurement/read-path-consistency")]
-    public async Task<S4ReadPathConsistencyResult> ReadPathConsistency([FromQuery] long tenantId = 0)
+    public async Task<S4ReadPathConsistencyResult> ReadPathConsistency()
     {
-        if (tenantId <= 0)
-            tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         return await _readPathCheck.CheckTenantAsync(tenantId);
     }
 
@@ -372,17 +377,19 @@ public class ProcurementPipelineService : IDynamicApiController, ITransient
         }
     }
 
-    private List<string> TryTriggerS4MdpRefresh(ProcurementPipelineResult result)
+    private List<string> TryTriggerS4MdpRefresh(long tenantId, ProcurementPipelineResult result)
     {
         if (result.PrCreatedCount == 0 && result.PoCreatedCount == 0)
             return new List<string>();
 
-        // 后台异步触发 S4 全量刷新(单飞+去抖),管线请求不再等待其完成
+        // 后台异步触发 S4 全量刷新(单飞+去抖),管线请求不再等待其完成。
+        // 注意:不得在闭包内解析 Scoped _userManager(后台线程是全新 DI scope,外层捕获的 Scoped 对象会错归属/读不到),
+        // 租户一律用入口已严格解析的 tenantId 显式传参。
+        var capturedTenantId = tenantId;
         _refreshDispatcher.Enqueue("S4", async (sp, ct) =>
         {
-            var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
             await sp.GetRequiredService<Admin.NET.Plugin.AiDOP.DataPlatform.MdpRebuild.ModuleRebuildService>()
-                .EnqueueAsync("S4", tenantId, 1, null, "PROCUREMENT_PIPELINE", ct);
+                .EnqueueAsync("S4", capturedTenantId, 1, null, "PROCUREMENT_PIPELINE", ct);
         });
 
         result.S4MdpRefreshed = true; // 语义变更:true = 已派发后台刷新(非“已刷新完成”)

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/PurchaseOrderService.cs

@@ -2,10 +2,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 物料采购订单服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 309, Description = "物料采购订单")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class PurchaseOrderService : IDynamicApiController, ITransient
 {

+ 23 - 26
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/PurchaseRequestService.cs

@@ -4,10 +4,16 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 物料采购申请服务
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
+/// <para>
+/// 原实现:类级 <c>[AllowAnonymous]</c> + 多处以 <c>if (_userManager.TenantId > 0)</c> 决定是否拼接租户条件。
+/// 匿名请求下 TenantId=0,租户过滤整体被跳过,等价于未认证可跨租户读/软删采购申请。
+/// </para>
 /// </summary>
 [ApiDescriptionSettings(Order = 308, Description = "物料采购申请")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class PurchaseRequestService : IDynamicApiController, ITransient
 {
@@ -28,19 +34,15 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var pars = new List<SugarParameter>();
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
         var where = new List<string>
         {
             "IFNULL(pm.IsDeleted,0)=0",
             "IFNULL(pm.state,0)<>0",
-            "IFNULL(pm.analogcalcversion,'')=''"
+            "IFNULL(pm.analogcalcversion,'')=''",
+            "pm.tenant_id=@TenantId"
         };
-
-        if (_userManager.TenantId > 0)
-        {
-            where.Add("pm.tenant_id=@TenantId");
-            pars.Add(new SugarParameter("@TenantId", _userManager.TenantId));
-        }
         if (!string.IsNullOrWhiteSpace(input.PrBillNo))
         {
             where.Add("pm.pr_billno LIKE @PrBillNo");
@@ -109,10 +111,8 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
     [HttpGet("purchase-request/{id:long}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
-        var tenantWhere = tenantId > 0 ? " AND pm.tenant_id=@TenantId" : string.Empty;
-        var pars = new List<SugarParameter> { new("@Id", id) };
-        if (tenantId > 0) pars.Add(new SugarParameter("@TenantId", tenantId));
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var pars = new List<SugarParameter> { new("@Id", id), new("@TenantId", tenantId) };
 
         var row = (await _db.Ado.SqlQueryAsync<PurchaseRequestDetailRow>(
             $"""
@@ -136,7 +136,7 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
                 pm.pr_purchaser AS PrPurchaser,
                 pm.currencytype AS CurrencyType
             FROM srm_pr_main pm
-            WHERE pm.Id=@Id AND IFNULL(pm.IsDeleted,0)=0{tenantWhere}
+            WHERE pm.Id=@Id AND IFNULL(pm.IsDeleted,0)=0 AND pm.tenant_id=@TenantId
             LIMIT 1
             """,
             pars)).FirstOrDefault();
@@ -154,6 +154,7 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
         if (!input.PrAqty.HasValue || input.PrAqty.Value <= 0) throw Oops.Oh("申请数量必须大于0");
 
         var now = DateTime.Now;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var aqty = input.PrAqty.Value;
         var prSsendDate = ParseDate(input.PrSsendDate) ?? now.Date;
         var prSarriveDate = ParseDate(input.PrSarriveDate);
@@ -202,7 +203,7 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
                 new SugarParameter("@UpdateBy", _userManager.UserId),
                 new SugarParameter("@UpdateByName", _userManager.Account),
                 new SugarParameter("@UpdateTime", now),
-                new SugarParameter("@TenantId", _userManager.TenantId),
+                new SugarParameter("@TenantId", tenantId),
                 new SugarParameter("@FactoryId", _userManager.OrgId),
                 new SugarParameter("@OrgId", _userManager.OrgId),
                 new SugarParameter("@IsDeleted", 0),
@@ -215,12 +216,9 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
         }
         else
         {
-            var tenantId = _userManager.TenantId;
-            var tenantSuffix = tenantId > 0 ? " AND tenant_id=@TenantId" : string.Empty;
-            var existPars = new List<SugarParameter> { new("@Id", input.Id.Value) };
-            if (tenantId > 0) existPars.Add(new SugarParameter("@TenantId", tenantId));
+            var existPars = new List<SugarParameter> { new("@Id", input.Id.Value), new("@TenantId", tenantId) };
             var exist = await _db.Ado.GetIntAsync(
-                $"SELECT COUNT(1) FROM srm_pr_main WHERE Id=@Id AND IFNULL(IsDeleted,0)=0{tenantSuffix}",
+                "SELECT COUNT(1) FROM srm_pr_main WHERE Id=@Id AND IFNULL(IsDeleted,0)=0 AND tenant_id=@TenantId",
                 existPars);
             if (exist <= 0) throw Oops.Oh("记录不存在");
 
@@ -249,7 +247,7 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
                     update_time=@UpdateTime,
                     IsRequireGoods=@IsRequireGoods,
                     supplier_type=@SupplierType
-                WHERE Id=@Id AND IFNULL(IsDeleted,0)=0{tenantSuffix}
+                WHERE Id=@Id AND IFNULL(IsDeleted,0)=0 AND tenant_id=@TenantId
                 """,
                 new SugarParameter("@Id", input.Id.Value),
                 new SugarParameter("@PrPurchaseId", input.PrPurchaseId!.Value),
@@ -284,22 +282,21 @@ public class PurchaseRequestService : IDynamicApiController, ITransient
     [HttpPost("purchase-request/delete/{id:long}")]
     public async Task<object> Delete(long id)
     {
-        var tenantId = _userManager.TenantId;
-        var tenantSuffix = tenantId > 0 ? " AND tenant_id=@TenantId" : string.Empty;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter>
         {
             new("@Id", id),
+            new("@TenantId", tenantId),
             new("@UpdateBy", _userManager.UserId),
             new("@UpdateByName", _userManager.Account),
             new("@UpdateTime", DateTime.Now)
         };
-        if (tenantId > 0) pars.Add(new SugarParameter("@TenantId", tenantId));
 
         var affected = await _db.Ado.ExecuteCommandAsync(
-            $"""
+            """
             UPDATE srm_pr_main
             SET IsDeleted=1,state=0,update_by=@UpdateBy,update_by_name=@UpdateByName,update_time=@UpdateTime
-            WHERE Id=@Id AND IFNULL(IsDeleted,0)=0{tenantSuffix}
+            WHERE Id=@Id AND IFNULL(IsDeleted,0)=0 AND tenant_id=@TenantId
             """,
             pars);
 

+ 14 - 20
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/S3MdpMonitorService.cs

@@ -4,10 +4,14 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// S3 MDP 运行监控。
+///
+/// 【租户安全边界】租户一律经 <see cref="AidopTenantScope.ResolveOrThrow"/> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级 <c>[AllowAnonymous]</c> +
+/// <c>_userManager.TenantId &gt; 0</c> 跳过分支,匿名时退化为 <c>tenant_id = 0</c> 平台行或不过滤)。
+/// 注:租户行与 <c>tenant_id = 0</c> 平台行的可见性语义(<c>BuildMdpRunLogTenantWhere</c>)保持不变。
 /// </summary>
 [ApiDescriptionSettings(Order = 320, Description = "S3 MDP运行监控")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class S3MdpMonitorService : IDynamicApiController, ITransient
 {
@@ -24,10 +28,9 @@ public class S3MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("s3-mdp-monitor/latest")]
     public async Task<object> GetLatest()
     {
-        var tenantId = _userManager.TenantId;
-        var tenantWhere = tenantId > 0 ? $" AND {MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId)}" : " AND tenant_id = 0";
-        var pars = new List<SugarParameter>();
-        if (tenantId > 0) pars.Add(new SugarParameter("@TenantId", tenantId));
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var tenantWhere = $" AND {MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId)}";
+        var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
 
         return await _db.Ado.SqlQuerySingleAsync<S3MdpRunLogRow>(
             $"{SelectColumnsSql()} FROM mdp_transform_run_log WHERE job_code='S3_MDP_SYNC_TRANSFORM'{tenantWhere} ORDER BY start_time DESC, id DESC LIMIT 1",
@@ -45,16 +48,9 @@ public class S3MdpMonitorService : IDynamicApiController, ITransient
         var where = new List<string> { "job_code='S3_MDP_SYNC_TRANSFORM'" };
         var pars = new List<SugarParameter>();
 
-        var tenantId = _userManager.TenantId;
-        if (tenantId > 0)
-        {
-            where.Add(MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId));
-            pars.Add(new SugarParameter("@TenantId", tenantId));
-        }
-        else
-        {
-            where.Add("tenant_id = 0");
-        }
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        where.Add(MdpMonitorService.BuildMdpRunLogTenantWhere(tenantId));
+        pars.Add(new SugarParameter("@TenantId", tenantId));
 
         if (!string.IsNullOrWhiteSpace(input.BatchId))
         {
@@ -96,13 +92,11 @@ public class S3MdpMonitorService : IDynamicApiController, ITransient
     [HttpGet("s3-mdp-monitor/detail/{id}")]
     public async Task<object> GetDetail(long id)
     {
-        var tenantId = _userManager.TenantId;
-        var tenantWhere = tenantId > 0 ? " AND tenant_id=@TenantId" : string.Empty;
-        var pars = new List<SugarParameter> { new("@Id", id) };
-        if (tenantId > 0) pars.Add(new SugarParameter("@TenantId", tenantId));
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
+        var pars = new List<SugarParameter> { new("@Id", id), new("@TenantId", tenantId) };
 
         var row = await _db.Ado.SqlQuerySingleAsync<S3MdpRunLogRow>(
-            $"{SelectColumnsSql()} FROM mdp_transform_run_log WHERE id=@Id{tenantWhere} LIMIT 1",
+            $"{SelectColumnsSql()} FROM mdp_transform_run_log WHERE id=@Id AND tenant_id=@TenantId LIMIT 1",
             pars);
         return row ?? throw Oops.Oh("运行日志不存在");
     }

+ 4 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Supply/WorkOrderMaterialReadinessService.cs

@@ -4,10 +4,13 @@ namespace Admin.NET.Plugin.AiDOP.Supply;
 
 /// <summary>
 /// 工单物料齐套上线看板服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退。
 /// </summary>
 [ApiDescriptionSettings(Order = 312, Description = "工单物料齐套上线看板")]
 [Route("api/Supply")]
-[AllowAnonymous]
 [NonUnify]
 public class WorkOrderMaterialReadinessService : IDynamicApiController, ITransient
 {

+ 6 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalCustomerService.cs

@@ -3,10 +3,14 @@ namespace Admin.NET.Plugin.AiDOP.Universal;
 /// <summary>
 /// 通用客户选择服务 🏢
 /// 路由前缀:/api/Universal
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级匿名 + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=</c> 读任意租户客户)。
 /// </summary>
 [ApiDescriptionSettings(Order = 280, Description = "通用-客户选择")]
 [Route("api/Universal")]
-[AllowAnonymous]
 [NonUnify]
 public class UniversalCustomerService : IDynamicApiController, ITransient
 {
@@ -24,7 +28,7 @@ public class UniversalCustomerService : IDynamicApiController, ITransient
     [HttpGet("customer/page")]
     public async Task<object> GetCustomerPage([FromQuery] UniversalCustomerPageInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var query = _custRep.AsQueryable()
             .Where(u => u.TenantId == tenantId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.CustNo),   u => u.Cust!.Contains(input.CustNo!.Trim()))

+ 6 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalItemService.cs

@@ -3,10 +3,14 @@ namespace Admin.NET.Plugin.AiDOP.Universal;
 /// <summary>
 /// 通用物料选择服务 📦
 /// 路由前缀:/api/Universal
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级匿名 + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=</c> 读任意租户物料)。
 /// </summary>
 [ApiDescriptionSettings(Order = 279, Description = "通用-物料选择")]
 [Route("api/Universal")]
-[AllowAnonymous]
 [NonUnify]
 public class UniversalItemService : IDynamicApiController, ITransient
 {
@@ -24,7 +28,7 @@ public class UniversalItemService : IDynamicApiController, ITransient
     [HttpGet("item/page")]
     public async Task<object> GetItemPage([FromQuery] UniversalItemPageInput input)
     {
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var query = _itemRep.AsQueryable()
             .Where(u => u.TenantId == tenantId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.ItemNum), u => u.ItemNum!.Contains(input.ItemNum!.Trim()))

+ 6 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalSourceListService.cs

@@ -2,10 +2,14 @@ namespace Admin.NET.Plugin.AiDOP.Universal;
 
 /// <summary>
 /// 通用货源清单选择服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级匿名 + 宽松解析,
+/// 未认证方可携带 <c>?tenantId=</c> 读任意租户货源清单)。
 /// </summary>
 [ApiDescriptionSettings(Order = 280, Description = "通用-货源清单选择")]
 [Route("api/Universal")]
-[AllowAnonymous]
 [NonUnify]
 public class UniversalSourceListService : IDynamicApiController, ITransient
 {
@@ -27,7 +31,7 @@ public class UniversalSourceListService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter>();
         var where = new List<string>
         {

+ 6 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Universal/UniversalWorkOrderService.cs

@@ -2,10 +2,14 @@ namespace Admin.NET.Plugin.AiDOP.Universal;
 
 /// <summary>
 /// 通用工单选择服务
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);
+/// 租户一律经 <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,
+/// 无有效租户即拒绝,不读前端 tenantId、无默认回退(原实现:类级匿名 +
+/// 直接取 <c>_userManager.TenantId</c>,匿名时 TenantId=0 查不到有效数据但端点仍暴露)。
 /// </summary>
 [ApiDescriptionSettings(Order = 281, Description = "通用-工单选择")]
 [Route("api/Universal")]
-[AllowAnonymous]
 [NonUnify]
 public class UniversalWorkOrderService : IDynamicApiController, ITransient
 {
@@ -26,7 +30,7 @@ public class UniversalWorkOrderService : IDynamicApiController, ITransient
         var pageSize = input.PageSize <= 0 ? 10 : input.PageSize;
         var offset = (page - 1) * pageSize;
 
-        var tenantId = _userManager.TenantId;
+        var tenantId = AidopTenantScope.ResolveOrThrow(_userManager);
         var where = new List<string>
         {
             "a.tenant_id = @TenantId",

+ 11 - 5
server/Plugins/Admin.NET.Plugin.AiDOP/WorkOrder/MaterialRequirementGenerationService.cs

@@ -3,10 +3,16 @@ using Admin.NET.Plugin.AiDOP.Supply;
 
 namespace Admin.NET.Plugin.AiDOP.WorkOrder;
 
-/// <summary>物料需求生成(MRP 入口,对接 S4 采购执行闭环)。</summary>
+/// <summary>
+/// 物料需求生成(MRP 入口,对接 S4 采购执行闭环)。
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId/domain 数字、无默认回退(原实现:类级匿名 + <c>ResolveTenantId(domain)</c>
+/// 信任前端直传的 domain 数字自选租户,否则回退宽松解析)。
+/// </summary>
 [ApiDescriptionSettings(Order = 261, Description = "物料需求生成")]
 [Route("api/WorkOrder")]
-[AllowAnonymous]
 [NonUnify]
 public class MaterialRequirementGenerationService : IDynamicApiController, ITransient
 {
@@ -48,8 +54,8 @@ public class MaterialRequirementGenerationService : IDynamicApiController, ITran
 
     private long ResolveTenantId(string? domain)
     {
-        if (!string.IsNullOrWhiteSpace(domain) && long.TryParse(domain.Trim(), out var tid) && tid > 0)
-            return tid;
-        return AidopTenantHelper.Resolve(App.HttpContext);
+        // 租户只信 JWT:不再从前端直传的 domain 数字解析(那是让调用方自选租户),
+        // domain 仅作为公司域业务参数用于日志归档。
+        return AidopTenantScope.ResolveOrThrow(_userManager);
     }
 }

+ 13 - 11
server/Plugins/Admin.NET.Plugin.AiDOP/WorkOrder/WorkOrderDispatchService.cs

@@ -10,10 +10,14 @@ namespace Admin.NET.Plugin.AiDOP.WorkOrder;
 /// <summary>
 /// 工单下达服务 🏭
 /// 路由前缀:/api/WorkOrder/dispatch/...
+///
+/// 【租户安全边界】需认证访问(已移除类级 <c>[AllowAnonymous]</c>);租户一律经
+/// <c>AidopTenantScope.ResolveOrThrow</c> 从认证后 JWT 解析,无有效租户即拒绝,
+/// 不读前端 tenantId/domain、无默认回退(原实现:类级匿名 + 宽松解析 <c>AidopTenantHelper.Resolve</c>
+/// 接受 query/Body 直传 tenantId,未认证方可指定任意租户取号与下达工单)。
 /// </summary>
 [ApiDescriptionSettings(Order = 260, Description = "工单下达")]
 [Route("api/WorkOrder")]
-[AllowAnonymous]
 [NonUnify]
 public class WorkOrderDispatchService : IDynamicApiController, ITransient
 {
@@ -55,8 +59,8 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
         _logger = logger;
     }
 
-    private long ResolveTenantId(long? requestTenantId) =>
-        AidopTenantHelper.Resolve(App.HttpContext, requestTenantId);
+    /// <summary>租户只信认证后 JWT,不读前端 tenantId/domain,无默认回退。</summary>
+    private long ResolveTenantId() => AidopTenantScope.ResolveOrThrow(_userManager);
 
     /// <summary>校验:本租户下存在处于初始状态(p)的该工单。</summary>
     private async Task AssertInitialWorkOrderExistsAsync(long tenantId, string workOrd)
@@ -83,7 +87,7 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
     [HttpGet("dispatch/list")]
     public async Task<object> GetDispatchList([FromQuery] WorkOrderDispatchListInput input)
     {
-        var tid = AidopTenantHelper.Resolve(App.HttpContext);
+        var tid = AidopTenantScope.ResolveOrThrow(_userManager);
         var pars = new List<SugarParameter> { new SugarParameter("@TenantId", tid) };
         // 与库内其它原生 SQL 一致:统一 COLLATE,避免 utf8mb4_general_ci / utf8mb4_0900_ai_ci 混用报错
         const string C = "utf8mb4_general_ci";
@@ -178,9 +182,9 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
     /// <summary>获取下一可用生产批号(当前日期 + 三位流水)🏭</summary>
     [DisplayName("获取下一生产批号")]
     [HttpGet("dispatch/next-lot-serial")]
-    public async Task<object> GetNextLotSerial([FromQuery] long? tenantId, [FromQuery] string workOrd)
+    public async Task<object> GetNextLotSerial([FromQuery] string workOrd)
     {
-        var tid = ResolveTenantId(tenantId);
+        var tid = ResolveTenantId();
         if (string.IsNullOrWhiteSpace(workOrd))
             throw Oops.Oh("工单编号不能为空");
 
@@ -215,7 +219,7 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(Name = "ReleaseWorkOrder"), HttpPost("dispatch/release")]
     public async Task<object> ReleaseWorkOrder([FromBody] WorkOrderReleaseInput input)
     {
-        var tid = ResolveTenantId(input.TenantId > 0 ? input.TenantId : null);
+        var tid = ResolveTenantId();
         var wo = input.WorkOrd.Trim();
         var logId = await _runLog.StartAsync("S2_WORK_ORDER_RELEASE", tid, "WorkOrdMaster", null, wo);
 
@@ -354,8 +358,7 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
     [HttpPost("dispatch/kitting-check")]
     public async Task<object> BatchKittingCheck([FromQuery] string domain, [FromQuery] string? userAccount)
     {
-        var tid = ResolveTenantId(
-            !string.IsNullOrWhiteSpace(domain) && long.TryParse(domain.Trim(), out var d) && d > 0 ? d : null);
+        var tid = ResolveTenantId();
         var account = string.IsNullOrWhiteSpace(userAccount)
             ? (_userManager.Account ?? "system")
             : userAccount.Trim();
@@ -384,8 +387,7 @@ public class WorkOrderDispatchService : IDynamicApiController, ITransient
     [HttpPost("dispatch/work-order-kitting-check")]
     public async Task<object> SingleKittingCheck([FromQuery] string workord, [FromQuery] string domain, [FromQuery] string? userAccount)
     {
-        var tid = ResolveTenantId(
-            !string.IsNullOrWhiteSpace(domain) && long.TryParse(domain.Trim(), out var d) && d > 0 ? d : null);
+        var tid = ResolveTenantId();
         var account = string.IsNullOrWhiteSpace(userAccount)
             ? (_userManager.Account ?? "system")
             : userAccount.Trim();