@chenchaolong/plugin-trade-compliance-workbench 1.0.52 → 1.0.54

package/dist/lib/workbench.service.js

@@ -9,10 +9,10 @@ import { mkdtemp, readFile, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { finished } from 'node:stream/promises';
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID } from 'node:crypto';
 import { BankAccountSettings, CatalogReviewBlock, CompanySanctionMatch, CompanySettings, ControlledCatalogBatch, ControlledCatalogImportIssue, ControlledGoodsRecord, Customer, CustomerContract, CustomerContractAnalysisRun, CustomerContractClause, CustomerContractClauseAnalysis, DerivedSalesOrderManualData, GeneratedSalesFile, ImportTask, ManagedAsset, MonthlySafeExchangeRate, ProductComplianceMatch, ProfitRuleSettings, PurchaseOrder, PurchaseOrderLine, SanctionCatalogBatch, SanctionCatalogImportIssue, SanctionedCompanyAlias, SanctionedCompanyRecord, SettingsHistory, Supplier } from './entities/index.js';
 import { CATALOG_REVIEW_BATCH_LIMIT } from './constants.js';
-import { CatalogTypes, ClauseTypes, CustomerProfitRateStatuses, DomainError, DomainErrorCodes, RefundValidationMethods, SalesPaymentStatuses, SanctionHitStatuses } from './types.js';
+import { CatalogTypes, ClauseTypes, CustomerProfitRateStatuses, DomainError, DomainErrorCodes, RefundValidationMethods, SalesPaymentStatuses, SanctionHitStatuses, StalledCatalogImportDecisions } from './types.js';
 import { deriveSalesLine, assertReceivedAmount } from './domain/finance.js';
 import { parseCustomerContractNo, parsePurchaseContractNo } from './domain/contract-number.js';
 import { isProductNameMatch, normalizeExactName, normalizeForProductMatch, normalizeHsCode, normalizeSanctionSource } from './domain/normalization.js';
@@ -24,7 +24,7 @@ import { TradeComplianceFileStorage } from './adapters/file-storage.js';
 import { TranslationProvider } from './adapters/translation.provider.js';
 import { parseBankAccountType, parseExchangeRateInput, parseExpectedRevision, validateBankSettingsInput, validateProfitSettingsInput, validatePurchaseLineDiscriminators, validateTaxRates } from './runtime-validation.js';
 import { publicCustomerContractReanalysisDto, publicImportTaskDto } from './public-dto.js';
-import { classifyCandidate } from './catalog-import/confidence.js';
+import { classifyCandidate, normalizeCatalogCandidate } from './catalog-import/confidence.js';
 import { catalogTerminalOutcome } from './catalog-import/outcome.js';
 import { analyticsBusinessDetailFromRaw, analyticsDashboardFromRaw, analyticsDashboardStatement, analyticsDetailStatement, analyticsDetailTotalFromRaw, analyticsExportComplianceFromRaw, analyticsExportCustomersFromRaw, analyticsExportFundRisksFromRaw, analyticsExportSalesFileReviewsFromRaw, analyticsExportStatements, analyticsExportSuppliersFromRaw, resolveAnalyticsPeriod } from './analytics-query.js';
 import { analyticsExportMaxRows, renderAnalyticsExportWorkbook } from './analytics-export.js';
@@ -210,17 +210,18 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return { ...transactionResult, sourceFileRemoved };
     }
     async deleteImportTaskTransientRows(manager, scope, task) {
+        await this.failCatalogDraft(manager, scope, task);
         await manager.getRepository(CatalogReviewBlock).delete({ ...activeScope(scope), importTaskId: task.id });
         await this.deleteEmptyImportCatalogBatch(manager, scope, task.id, ControlledCatalogBatch, ControlledGoodsRecord, ControlledCatalogImportIssue);
         await this.deleteEmptyImportCatalogBatch(manager, scope, task.id, SanctionCatalogBatch, SanctionedCompanyRecord, SanctionCatalogImportIssue);
     }
     async deleteEmptyImportCatalogBatch(manager, scope, importTaskId, batchEntity, recordEntity, issueEntity) {
         const batchRepo = manager.getRepository(batchEntity);
-        const batch = await batchRepo.findOne({ where: { ...activeScope(scope), importTaskId } });
+        const batch = await batchRepo.findOne({ where: { ...activeScope(scope), importTaskId }, withDeleted: true });
         if (!batch)
             return;
         const committedRows = await manager.getRepository(recordEntity).count({
-            where: { ...activeScope(scope), batchId: batch.id }
+            where: { ...activeScope(scope), batchId: batch.id }, withDeleted: true
         });
         if (committedRows > 0)
             return;
@@ -231,8 +232,8 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const where = { ...activeScope(scope), sourceFileId: task.sourceFileId };
         const [otherTasks, controlledBatches, sanctionBatches, contracts, orders] = await Promise.all([
             manager.getRepository(ImportTask).count({ where: { ...where, id: Not(task.id) } }),
-            manager.getRepository(ControlledCatalogBatch).count({ where }),
-            manager.getRepository(SanctionCatalogBatch).count({ where }),
+            manager.getRepository(ControlledCatalogBatch).count({ where, withDeleted: true }),
+            manager.getRepository(SanctionCatalogBatch).count({ where, withDeleted: true }),
             manager.getRepository(CustomerContract).count({ where }),
             manager.getRepository(PurchaseOrder).count({ where })
         ]);
@@ -291,23 +292,27 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             return { run: publicCustomerContractReanalysisDto(run), consumed };
         });
     }
-    async listControlledBatches(scope, query = {}) { return this.pagedQuery(ControlledCatalogBatch, scope, query, ['sourceFileName'], { catalogType: query.parameters?.catalogType }); }
-    async listSanctionBatches(scope, query = {}) { return this.pagedQuery(SanctionCatalogBatch, scope, query, ['sourceFileName']); }
+    async listControlledBatches(scope, query = {}) { return this.pagedQuery(ControlledCatalogBatch, scope, query, ['sourceFileName'], { lifecycleStatus: 'ACTIVE', catalogType: query.parameters?.catalogType }); }
+    async listSanctionBatches(scope, query = {}) { return this.pagedQuery(SanctionCatalogBatch, scope, query, ['sourceFileName'], { lifecycleStatus: 'ACTIVE' }); }
     async listControlledBatchHistory(scope, query = {}) { return this.pagedBatchHistoryQuery(ControlledCatalogBatch, scope, query, { catalogType: query.parameters?.catalogType }); }
     async listSanctionBatchHistory(scope, query = {}) { return this.pagedBatchHistoryQuery(SanctionCatalogBatch, scope, query); }
     async saveControlledGoods(scope, input) {
-        const repo = this.dataSource.getRepository(ControlledGoodsRecord);
-        const productName = input.productName.trim();
-        const normalizedProductName = productName.trim();
-        const normalizedHsCode = String(input.hsCode ?? '').replace(/\s/g, '');
-        const duplicate = await repo.findOne({ where: { ...activeScope(scope), catalogType: input.catalogType, normalizedProductName, normalizedHsCode, deletedAt: IsNull() } });
-        if (duplicate)
-            throw new DomainError(DomainErrorCodes.DUPLICATE_CATALOG_RECORD, '相同目录类型、商品名称和海关编码的记录已存在', { id: duplicate.id });
-        return controlledGoodsDto(await repo.save(repo.create({ ...auditScope(scope), sourceType: input.sourceType ?? 'MANUAL_ENTRY', catalogType: input.catalogType, productName, normalizedProductName, hsCode: input.hsCode ?? null, normalizedHsCode, controlDescription: input.controlDescription ?? null, sourceLocation: input.sourceLocation ?? null, sourceContent: input.sourceContent ?? null })));
+        const persist = async (manager) => {
+            await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
+            const repo = manager.getRepository(ControlledGoodsRecord);
+            const productName = input.productName.trim();
+            const normalizedProductName = productName.trim();
+            const normalizedHsCode = String(input.hsCode ?? '').replace(/\s/g, '');
+            const duplicate = await repo.findOne({ where: { ...activeScope(scope), lifecycleStatus: 'ACTIVE', catalogType: input.catalogType, normalizedProductName, normalizedHsCode, deletedAt: IsNull() } });
+            if (duplicate)
+                throw new DomainError(DomainErrorCodes.DUPLICATE_CATALOG_RECORD, '相同目录类型、商品名称和海关编码的记录已存在', { id: duplicate.id });
+            return controlledGoodsDto(await repo.save(repo.create({ ...auditScope(scope), lifecycleStatus: 'ACTIVE', sourceType: input.sourceType ?? 'MANUAL_ENTRY', catalogType: input.catalogType, productName, normalizedProductName, hsCode: input.hsCode ?? null, normalizedHsCode, controlDescription: input.controlDescription ?? null, sourceLocation: input.sourceLocation ?? null, sourceContent: input.sourceContent ?? null })));
+        };
+        return this.dataSource.options?.type === 'postgres' ? this.dataSource.transaction(persist) : persist(this.dataSource);
     }
     async updateControlledGoods(scope, id, input) {
         const repo = this.dataSource.getRepository(ControlledGoodsRecord);
-        const item = await required(repo.findOne({ where: { ...activeScope(scope), id, deletedAt: IsNull() } }), '管控商品不存在');
+        const item = await required(repo.findOne({ where: { ...activeScope(scope), id, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '管控商品不存在');
         Object.assign(item, pick(input, ['catalogType', 'productName', 'hsCode', 'controlDescription']));
         item.normalizedProductName = item.productName.trim();
         item.normalizedHsCode = String(item.hsCode ?? '').replace(/\s/g, '');
@@ -450,6 +455,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async persistControlledCatalog(scope, input, localizedRows, claimId) {
         return this.dataSource.transaction(async (manager) => {
+            await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
             const batchRepo = manager.getRepository(ControlledCatalogBatch);
             const recordRepo = manager.getRepository(ControlledGoodsRecord);
             const taskRepo = manager.getRepository(ImportTask);
@@ -463,7 +469,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             await taskRepo.save(task);
             const now = new Date();
             if (input.replaceBatchId) {
-                const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, deletedAt: IsNull() } }), '被覆盖目录批次不存在');
+                const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '被覆盖目录批次不存在');
                 old.deletedAt = now;
                 old.deletedById = scope.userId ?? null;
                 old.deleteOperation = 'CATALOG_REPLACE';
@@ -471,7 +477,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 await batchRepo.save(old);
                 await recordRepo.update({ ...activeScope(scope), batchId: old.id, deletedAt: IsNull() }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'CATALOG_REPLACE' });
             }
-            const batch = await batchRepo.save(batchRepo.create({ ...auditScope(scope), catalogType: input.catalogType, sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName, importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null, totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, importTaskId: input.importTaskId, riskRecalculatedAt: null }));
+            const batch = await batchRepo.save(batchRepo.create({ ...auditScope(scope), lifecycleStatus: 'ACTIVE', catalogType: input.catalogType, sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName, importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null, totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, importTaskId: input.importTaskId, riskRecalculatedAt: null }));
             await this.appendControlledCatalogRows(manager, scope, batch, input.rows, localizedRows);
             await batchRepo.save(batch);
             task.status = 'SUCCEEDED';
@@ -485,6 +491,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async appendCompletedControlledCatalog(scope, input, localizedRows, expectedBatchId) {
         return this.dataSource.transaction(async (manager) => {
+            await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
             const task = await required(manager.getRepository(ImportTask).findOne({
                 where: { ...activeScope(scope), id: input.importTaskId },
                 lock: { mode: 'pessimistic_write' }
@@ -537,9 +544,11 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 await issueRepo.save(issueRepo.create({ ...createdScope(scope), batchId: batch.id, issueType: 'INVALID', sourceSequence: batch.totalCount, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null, parsedPayload: row, message: localized.error }));
                 continue;
             }
-            const duplicate = await recordRepo.findOne({ where: { ...activeScope(scope), catalogType: batch.catalogType, normalizedProductName: productName, normalizedHsCode, deletedAt: IsNull() } });
-            if (duplicate?.batchId === batch.id)
-                continue;
+            const duplicate = await recordRepo.findOne({ where: [
+                    { ...activeScope(scope), batchId: batch.id, lifecycleStatus: batch.lifecycleStatus, catalogType: batch.catalogType, normalizedProductName: productName, normalizedHsCode, deletedAt: IsNull() },
+                    ...(batch.replacedBatchId ? [{ ...activeScope(scope), batchId: IsNull(), lifecycleStatus: 'ACTIVE', catalogType: batch.catalogType, normalizedProductName: productName, normalizedHsCode, deletedAt: IsNull() }] : []),
+                    { ...activeScope(scope), lifecycleStatus: 'ACTIVE', catalogType: batch.catalogType, normalizedProductName: productName, normalizedHsCode, deletedAt: IsNull(), ...(batch.replacedBatchId ? { batchId: Not(batch.replacedBatchId) } : {}) }
+                ] });
             if (duplicate && await this.catalogIssueExists(issueRepo, scope, batch.id, 'DUPLICATE', row))
                 continue;
             changed = true;
@@ -549,7 +558,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 await issueRepo.save(issueRepo.create({ ...createdScope(scope), batchId: batch.id, issueType: 'DUPLICATE', sourceSequence: batch.totalCount, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null, parsedPayload: row, message: '目录中已存在相同商品名称和海关编码' }));
                 continue;
             }
-            await recordRepo.save(recordRepo.create({ ...auditScope(scope), batchId: batch.id, sourceType: 'FILE_IMPORT', catalogType: batch.catalogType, productName, normalizedProductName: productName, hsCode: row.hsCode ?? null, normalizedHsCode, controlDescription: localized.controlDescription, originalProductName: localized.originalProductName, originalControlDescription: localized.originalControlDescription, translationSource: localized.translationSource, controlCode: row.controlCode ?? null, sourceSection: row.sourceSection ?? null, sourceOrdinal: row.sourceOrdinal ?? null, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null }));
+            await recordRepo.save(recordRepo.create({ ...auditScope(scope), batchId: batch.id, lifecycleStatus: batch.lifecycleStatus, sourceType: 'FILE_IMPORT', catalogType: batch.catalogType, productName, normalizedProductName: productName, hsCode: row.hsCode ?? null, normalizedHsCode, controlDescription: localized.controlDescription, originalProductName: localized.originalProductName, originalControlDescription: localized.originalControlDescription, translationSource: localized.translationSource, controlCode: row.controlCode ?? null, sourceSection: row.sourceSection ?? null, sourceOrdinal: row.sourceOrdinal ?? null, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null }));
             batch.successCount += 1;
             batch.riskRecalculatedAt = null;
         }
@@ -696,20 +705,24 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return { fileName: `${batch.sourceFileName}-导入问题明细.xlsx`, buffer: await renderImportIssuesWorkbook(issues) };
     }
     async saveSanctionedCompany(scope, input) {
-        const repo = this.dataSource.getRepository(SanctionedCompanyRecord);
-        const companyName = input.companyName.trim();
-        const normalizedCompanyName = normalizeExactName(companyName);
-        const normalizedSanctionListSource = normalizeSanctionSource(input.sanctionListSource);
-        const duplicate = await repo.findOne({ where: { ...activeScope(scope), normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() } });
-        if (duplicate)
-            throw new DomainError(DomainErrorCodes.DUPLICATE_CATALOG_RECORD, '相同公司名称和制裁名单来源的记录已存在', { id: duplicate.id });
-        const saved = await repo.save(repo.create({ ...auditScope(scope), sourceType: input.sourceType ?? 'MANUAL_ENTRY', companyName, normalizedCompanyName, countryOrRegion: input.countryOrRegion ?? null, sanctionListSource: input.sanctionListSource ?? null, normalizedSanctionListSource, sanctionReason: input.sanctionReason ?? null, effectiveDate: input.effectiveDate ?? null, remarks: input.remarks ?? null, sourceLocation: input.sourceLocation ?? null, sourceContent: input.sourceContent ?? null }));
+        const persist = async (manager) => {
+            await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
+            const repo = manager.getRepository(SanctionedCompanyRecord);
+            const companyName = input.companyName.trim();
+            const normalizedCompanyName = normalizeExactName(companyName);
+            const normalizedSanctionListSource = normalizeSanctionSource(input.sanctionListSource);
+            const duplicate = await repo.findOne({ where: { ...activeScope(scope), lifecycleStatus: 'ACTIVE', normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() } });
+            if (duplicate)
+                throw new DomainError(DomainErrorCodes.DUPLICATE_CATALOG_RECORD, '相同公司名称和制裁名单来源的记录已存在', { id: duplicate.id });
+            return repo.save(repo.create({ ...auditScope(scope), lifecycleStatus: 'ACTIVE', sourceType: input.sourceType ?? 'MANUAL_ENTRY', companyName, normalizedCompanyName, countryOrRegion: input.countryOrRegion ?? null, sanctionListSource: input.sanctionListSource ?? null, normalizedSanctionListSource, sanctionReason: input.sanctionReason ?? null, effectiveDate: input.effectiveDate ?? null, remarks: input.remarks ?? null, sourceLocation: input.sourceLocation ?? null, sourceContent: input.sourceContent ?? null }));
+        };
+        const saved = await (this.dataSource.options?.type === 'postgres' ? this.dataSource.transaction(persist) : persist(this.dataSource));
         await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED');
         return sanctionedCompanyDto(saved);
     }
     async updateSanctionedCompany(scope, id, input) {
         const repo = this.dataSource.getRepository(SanctionedCompanyRecord);
-        const item = await required(repo.findOne({ where: { ...activeScope(scope), id, deletedAt: IsNull() } }), '制裁公司不存在');
+        const item = await required(repo.findOne({ where: { ...activeScope(scope), id, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '制裁公司不存在');
         Object.assign(item, pick(input, ['companyName', 'countryOrRegion', 'sanctionListSource', 'sanctionReason', 'effectiveDate', 'remarks']));
         item.normalizedCompanyName = normalizeExactName(item.companyName);
         item.normalizedSanctionListSource = normalizeSanctionSource(item.sanctionListSource);
@@ -720,6 +733,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async importSanctionCatalog(scope, input) {
         const batch = await this.dataSource.transaction(async (manager) => {
+            await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
             const batchRepo = manager.getRepository(SanctionCatalogBatch);
             const recordRepo = manager.getRepository(SanctionedCompanyRecord);
             const issueRepo = manager.getRepository(SanctionCatalogImportIssue);
@@ -736,7 +750,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 await taskRepo.save(task);
                 const now = new Date();
                 if (input.replaceBatchId) {
-                    const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, deletedAt: IsNull() } }), '被覆盖制裁批次不存在');
+                    const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '被覆盖制裁批次不存在');
                     old.deletedAt = now;
                     old.deletedById = scope.userId ?? null;
                     old.deleteOperation = 'SANCTION_CATALOG_REPLACE';
@@ -744,7 +758,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     await batchRepo.save(old);
                     await recordRepo.update({ ...activeScope(scope), batchId: old.id, deletedAt: IsNull() }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'SANCTION_CATALOG_REPLACE' });
                 }
-                result = await batchRepo.save(batchRepo.create({ ...auditScope(scope), sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName, importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null, totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, importTaskId: input.importTaskId }));
+                result = await batchRepo.save(batchRepo.create({ ...auditScope(scope), lifecycleStatus: 'ACTIVE', sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName, importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null, totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, importTaskId: input.importTaskId, riskRecalculatedAt: null }));
             }
             let changed = false;
             for (let index = 0; index < input.rows.length; index += 1) {
@@ -761,9 +775,11 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 }
                 const normalizedCompanyName = normalizeExactName(companyName);
                 const normalizedSanctionListSource = normalizeSanctionSource(row.sanctionListSource);
-                const duplicate = await recordRepo.findOne({ where: { ...activeScope(scope), normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() } });
-                if (duplicate?.batchId === result.id)
-                    continue;
+                const duplicate = await recordRepo.findOne({ where: [
+                        { ...activeScope(scope), batchId: result.id, lifecycleStatus: result.lifecycleStatus, normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() },
+                        ...(result.replacedBatchId ? [{ ...activeScope(scope), batchId: IsNull(), lifecycleStatus: 'ACTIVE', normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() }] : []),
+                        { ...activeScope(scope), lifecycleStatus: 'ACTIVE', normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull(), ...(result.replacedBatchId ? { batchId: Not(result.replacedBatchId) } : {}) }
+                    ] });
                 if (duplicate && await this.catalogIssueExists(issueRepo, scope, result.id, 'DUPLICATE', row))
                     continue;
                 changed = true;
@@ -773,9 +789,11 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     await issueRepo.save(issueRepo.create({ ...createdScope(scope), batchId: result.id, issueType: 'DUPLICATE', sourceSequence: result.totalCount, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null, parsedPayload: row, message: '制裁目录中已存在相同公司和名单来源' }));
                     continue;
                 }
-                await recordRepo.save(recordRepo.create({ ...auditScope(scope), batchId: result.id, sourceType: 'FILE_IMPORT', companyName, normalizedCompanyName, countryOrRegion: row.countryOrRegion ?? null, sanctionListSource: row.sanctionListSource ?? null, normalizedSanctionListSource, sanctionReason: row.sanctionReason ?? null, effectiveDate: row.effectiveDate ?? null, remarks: row.remarks ?? null, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null }));
+                await recordRepo.save(recordRepo.create({ ...auditScope(scope), batchId: result.id, lifecycleStatus: result.lifecycleStatus, sourceType: 'FILE_IMPORT', companyName, normalizedCompanyName, countryOrRegion: row.countryOrRegion ?? null, sanctionListSource: row.sanctionListSource ?? null, normalizedSanctionListSource, sanctionReason: row.sanctionReason ?? null, effectiveDate: row.effectiveDate ?? null, remarks: row.remarks ?? null, sourceLocation: row.sourceLocation ?? null, sourceContent: row.sourceContent ?? null }));
                 result.successCount += 1;
             }
+            if (changed)
+                result.riskRecalculatedAt = null;
             const saved = !appending || changed ? await batchRepo.save(result) : result;
             if (!appending) {
                 task.status = 'SUCCEEDED';
@@ -785,7 +803,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             }
             return saved;
         });
-        await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED');
+        await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED', batch.id);
         return batch;
     }
     async beginFastCatalogImport(scope, input) {
@@ -802,25 +820,17 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 return { committedCursor: task.progress.committedCursor, batchId: task.resultEntityId };
             }
             assertImportTaskResultWritable(task);
-            const now = new Date();
             let batchId;
             if (task.documentType === 'CONTROLLED_CATALOG') {
                 const catalogType = input.catalogType;
                 if (!catalogType)
                     throw new DomainError(DomainErrorCodes.INVALID_INPUT, '管控目录缺少目录类型');
                 const batchRepo = manager.getRepository(ControlledCatalogBatch);
-                const recordRepo = manager.getRepository(ControlledGoodsRecord);
                 if (input.replaceBatchId) {
-                    const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, deletedAt: IsNull() } }), '被覆盖目录批次不存在');
-                    old.deletedAt = now;
-                    old.deletedById = scope.userId ?? null;
-                    old.deleteOperation = 'CATALOG_REPLACE';
-                    old.updatedById = scope.userId ?? null;
-                    await batchRepo.save(old);
-                    await recordRepo.update({ ...activeScope(scope), batchId: old.id, deletedAt: IsNull() }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'CATALOG_REPLACE' });
+                    await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '被覆盖目录批次不存在');
                 }
                 const batch = await batchRepo.save(batchRepo.create({
-                    ...auditScope(scope), catalogType, sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName,
+                    ...auditScope(scope), lifecycleStatus: 'DRAFT', catalogType, sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName,
                     importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null,
                     totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, skippedCount: 0,
                     inferenceMetadata: input.inferenceMetadata ?? null,
@@ -830,21 +840,14 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             }
             else {
                 const batchRepo = manager.getRepository(SanctionCatalogBatch);
-                const recordRepo = manager.getRepository(SanctionedCompanyRecord);
                 if (input.replaceBatchId) {
-                    const old = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, deletedAt: IsNull() } }), '被覆盖制裁目录批次不存在');
-                    old.deletedAt = now;
-                    old.deletedById = scope.userId ?? null;
-                    old.deleteOperation = 'SANCTION_CATALOG_REPLACE';
-                    old.updatedById = scope.userId ?? null;
-                    await batchRepo.save(old);
-                    await recordRepo.update({ ...activeScope(scope), batchId: old.id, deletedAt: IsNull() }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'SANCTION_CATALOG_REPLACE' });
+                    await required(batchRepo.findOne({ where: { ...activeScope(scope), id: input.replaceBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }), '被覆盖制裁目录批次不存在');
                 }
                 const batch = await batchRepo.save(batchRepo.create({
-                    ...auditScope(scope), sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName,
+                    ...auditScope(scope), lifecycleStatus: 'DRAFT', sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName,
                     importMode: input.replaceBatchId ? 'REPLACE_BATCH' : 'APPEND', replacedBatchId: input.replaceBatchId ?? null,
                     totalCount: 0, successCount: 0, duplicateCount: 0, invalidCount: 0, skippedCount: 0,
-                    inferenceMetadata: input.inferenceMetadata ?? null, importTaskId: task.id
+                    inferenceMetadata: input.inferenceMetadata ?? null, importTaskId: task.id, riskRecalculatedAt: null
                 }));
                 batchId = batch.id;
             }
@@ -857,43 +860,47 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         });
     }
     async appendFastCatalogBatch(scope, input) {
+        const preflight = await this.dataSource.transaction(async (manager) => {
+            const locked = await this.lockFastCatalogAppend(manager, scope, input.taskId);
+            if (locked.task.progress.committedCursor >= input.endCursor && input.endCursor > input.startCursor) {
+                return locked.task.progress;
+            }
+            if (locked.task.progress.committedCursor !== input.startCursor) {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入游标不一致');
+            }
+            return null;
+        });
+        if (preflight)
+            return preflight;
         const controlledRows = input.candidates.flatMap(candidate => candidate.kind === 'CONTROLLED'
             ? candidateToControlledRows(candidate)
             : []);
         const localizedRows = controlledRows.length ? await this.localizeControlledCatalogRows(controlledRows, scope.organizationId) : [];
         return this.dataSource.transaction(async (manager) => {
+            const { task, controlledBatch, sanctionBatch } = await this.lockFastCatalogAppend(manager, scope, input.taskId);
             const taskRepo = manager.getRepository(ImportTask);
-            const task = await required(taskRepo.findOne({
-                where: { ...activeScope(scope), id: input.taskId },
-                lock: { mode: 'pessimistic_write' }
-            }), '解析任务不存在');
-            if (!task.progress || task.progress.mode !== 'FAST_PIPELINE' || !task.resultEntityId) {
-                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入尚未初始化');
-            }
             if (task.progress.committedCursor >= input.endCursor && input.endCursor > input.startCursor)
                 return task.progress;
             if (task.progress.committedCursor !== input.startCursor) {
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入游标不一致');
             }
             if (task.documentType === 'CONTROLLED_CATALOG') {
-                const batchRepo = manager.getRepository(ControlledCatalogBatch);
-                const batch = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: task.resultEntityId } }), '管控目录批次不存在');
-                await this.appendControlledCatalogRows(manager, scope, batch, controlledRows, localizedRows);
-                await this.appendCatalogSkippedSources(manager.getRepository(ControlledCatalogImportIssue), scope, batch, input.skipped);
-                await batchRepo.save(batch);
-                task.progress.successCount = batch.successCount;
-                task.progress.duplicateCount = batch.duplicateCount;
-                task.progress.invalidCount = batch.invalidCount;
-                task.progress.skippedCount = batch.skippedCount;
+                await this.appendControlledCatalogRows(manager, scope, controlledBatch, controlledRows, localizedRows);
+                await this.appendCatalogSkippedSources(manager.getRepository(ControlledCatalogImportIssue), scope, controlledBatch, input.skipped);
+                await manager.getRepository(ControlledCatalogBatch).save(controlledBatch);
+                task.progress.successCount = controlledBatch.successCount;
+                task.progress.duplicateCount = controlledBatch.duplicateCount;
+                task.progress.invalidCount = controlledBatch.invalidCount;
+                task.progress.skippedCount = controlledBatch.skippedCount;
             }
             else {
-                const batch = await this.appendFastSanctionCandidates(manager, scope, task.resultEntityId, input.candidates);
-                await this.appendCatalogSkippedSources(manager.getRepository(SanctionCatalogImportIssue), scope, batch, input.skipped);
-                await manager.getRepository(SanctionCatalogBatch).save(batch);
-                task.progress.successCount = batch.successCount;
-                task.progress.duplicateCount = batch.duplicateCount;
-                task.progress.invalidCount = batch.invalidCount;
-                task.progress.skippedCount = batch.skippedCount;
+                const savedBatch = await this.appendFastSanctionCandidates(manager, scope, task.resultEntityId, input.candidates, sanctionBatch);
+                await this.appendCatalogSkippedSources(manager.getRepository(SanctionCatalogImportIssue), scope, savedBatch, input.skipped);
+                await manager.getRepository(SanctionCatalogBatch).save(savedBatch);
+                task.progress.successCount = savedBatch.successCount;
+                task.progress.duplicateCount = savedBatch.duplicateCount;
+                task.progress.invalidCount = savedBatch.invalidCount;
+                task.progress.skippedCount = savedBatch.skippedCount;
             }
             let insertedReviewCount = 0;
             if (input.reviewBlocks.length) {
@@ -910,7 +917,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                         confidence: block.confidence, status: 'PENDING', ordinal: block.ordinal,
                         sourceLocation: block.sourceLocation || null, sourceContent: block.sourceContent || null,
                         payload: block.payload, reasons: block.reasons,
-                        leaseToken: null, leaseExpiresAt: null, resolvedAt: null
+                        leaseToken: null, leaseExpiresAt: null, resolvedAt: null, resolutionFingerprint: null
                     }));
                     insertedReviewCount += 1;
                 }
@@ -926,6 +933,33 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             return task.progress;
         });
     }
+    async lockFastCatalogAppend(manager, scope, taskId) {
+        const task = await required(manager.getRepository(ImportTask).findOne({
+            where: { ...activeScope(scope), id: taskId }, lock: { mode: 'pessimistic_write' }
+        }), '解析任务不存在');
+        if (task.status !== 'PERSISTING' || !task.progress || task.progress.mode !== 'FAST_PIPELINE' || !task.resultEntityId) {
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入状态无效');
+        }
+        const controlledBatch = task.documentType === 'CONTROLLED_CATALOG'
+            ? await required(manager.getRepository(ControlledCatalogBatch).findOne({
+                where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+            }), '管控目录批次不存在')
+            : null;
+        const sanctionBatch = task.documentType === 'SANCTION_CATALOG'
+            ? await required(manager.getRepository(SanctionCatalogBatch).findOne({
+                where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+            }), '制裁目录批次不存在')
+            : null;
+        const batch = controlledBatch ?? sanctionBatch;
+        if (!batch || batch.importTaskId !== task.id || (batch.lifecycleStatus !== 'DRAFT' && batch.lifecycleStatus !== 'REVIEWING')) {
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入状态无效');
+        }
+        return {
+            task: task,
+            controlledBatch,
+            sanctionBatch
+        };
+    }
     async finalizeFastCatalogImport(scope, taskId) {
         const task = await this.dataSource.transaction(async (manager) => {
             const repo = manager.getRepository(ImportTask);
@@ -935,7 +969,12 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (!current.progress || current.progress.mode !== 'FAST_PIPELINE') {
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '快速目录导入进度不存在');
             }
+            if (current.status === 'SUCCEEDED') {
+                await this.assertCatalogBatchPublished(manager, scope, current);
+                return current;
+            }
             if (current.progress.reviewPendingCount > 0) {
+                await this.markCatalogDraftReviewing(manager, scope, current);
                 current.status = 'AWAITING_REVIEW';
                 current.progress.stage = 'REVIEWING';
                 current.progress.observerStatus = 'PENDING';
@@ -953,6 +992,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     await this.applyImportTaskFailure(manager, scope, current, 'FAILED', outcome.errorCode, outcome.errorMessage);
                 }
                 else {
+                    await this.publishCatalogDraft(manager, scope, current);
                     current.status = 'SUCCEEDED';
                     current.progress.stage = 'SUCCEEDED';
                     current.progress.observerStatus = 'COMPLETED';
@@ -969,10 +1009,125 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (task.documentType === 'CONTROLLED_CATALOG')
                 await this.recalculateProductRisks(scope, 'CATALOG_CHANGED', task.resultEntityId ?? undefined);
             else
-                await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED');
+                await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED', task.resultEntityId ?? undefined);
         }
         return task;
     }
+    async resolveStalledCatalogImport(scope, taskId, decision) {
+        if (!StalledCatalogImportDecisions.includes(decision)) {
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录恢复决定无效');
+        }
+        const result = await this.dataSource.transaction(async (manager) => {
+            const taskRepo = manager.getRepository(ImportTask);
+            const unfinishedTaskWhere = { ...activeScope(scope), id: taskId, deletedAt: IsNull(), completedAt: IsNull() };
+            const task = await required(taskRepo.findOne({
+                where: decision === 'PUBLISH_VALID_ROWS'
+                    ? [unfinishedTaskWhere, { ...activeScope(scope), id: taskId, deletedAt: IsNull(), status: 'SUCCEEDED' }]
+                    : unfinishedTaskWhere,
+                lock: { mode: 'pessimistic_write' }
+            }), '解析任务不存在');
+            if (task.deletedAt != null ||
+                (task.documentType !== 'CONTROLLED_CATALOG' && task.documentType !== 'SANCTION_CATALOG') ||
+                task.progress?.mode !== 'FAST_PIPELINE' ||
+                !task.resultEntityId) {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅待复核的快速目录导入任务支持显式恢复');
+            }
+            const progress = task.progress;
+            const batchId = task.resultEntityId;
+            const publishedRetry = decision === 'PUBLISH_VALID_ROWS' && task.status === 'SUCCEEDED' && task.completedAt != null;
+            const awaitingRecovery = task.status === 'AWAITING_REVIEW' && task.completedAt == null;
+            if (!publishedRetry && !awaitingRecovery)
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅待复核的快速目录导入任务支持显式恢复');
+            const batch = task.documentType === 'CONTROLLED_CATALOG'
+                ? await required(manager.getRepository(ControlledCatalogBatch).findOne({
+                    where: { ...activeScope(scope), id: batchId, importTaskId: task.id, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' }
+                }), '管控目录批次不存在')
+                : await required(manager.getRepository(SanctionCatalogBatch).findOne({
+                    where: { ...activeScope(scope), id: batchId, importTaskId: task.id, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' }
+                }), '制裁目录批次不存在');
+            if (batch.importTaskId !== task.id || batch.deletedAt ||
+                (publishedRetry ? batch.lifecycleStatus !== 'ACTIVE' : !['DRAFT', 'REVIEWING', 'ACTIVE'].includes(batch.lifecycleStatus))) {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录恢复批次状态无效');
+            }
+            if (publishedRetry) {
+                return {
+                    task: publicImportTaskDto(task),
+                    batchCounts: {
+                        totalCount: batch.totalCount, successCount: batch.successCount, duplicateCount: batch.duplicateCount,
+                        invalidCount: batch.invalidCount, skippedCount: batch.skippedCount ?? 0
+                    }
+                };
+            }
+            const reviewRepo = manager.getRepository(CatalogReviewBlock);
+            const unresolved = await reviewRepo.find({ where: {
+                    ...activeScope(scope), importTaskId: task.id, status: In(['PENDING', 'LEASED'])
+                }, order: { ordinal: 'ASC', id: 'ASC' } });
+            const resolvedAt = new Date();
+            for (const block of unresolved) {
+                block.status = 'REJECTED';
+                block.leaseExpiresAt = null;
+                block.resolvedAt = resolvedAt;
+            }
+            if (decision === 'PUBLISH_VALID_ROWS') {
+                await this.appendStalledCatalogReviewIssues(manager, scope, task, batch, unresolved);
+            }
+            if (unresolved.length > 0)
+                await reviewRepo.save(unresolved);
+            await this.reconcileCatalogReviewPendingCount(reviewRepo, scope, task);
+            if (progress.reviewPendingCount !== 0) {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录恢复后仍存在待复核块');
+            }
+            progress.reviewRejectedCount += unresolved.length;
+            progress.successCount = batch.successCount;
+            progress.duplicateCount = batch.duplicateCount;
+            progress.invalidCount = batch.invalidCount;
+            progress.skippedCount = batch.skippedCount ?? 0;
+            progress.progressVersion += 1;
+            progress.lastProgressAt = new Date().toISOString();
+            if (decision === 'PUBLISH_VALID_ROWS') {
+                const outcome = catalogTerminalOutcome(batch);
+                progress.outcome = outcome.outcome;
+                if (outcome.status === 'FAILED') {
+                    await this.applyImportTaskFailure(manager, scope, task, 'FAILED', outcome.errorCode, outcome.errorMessage);
+                }
+                else {
+                    if (batch.lifecycleStatus === 'DRAFT' || batch.lifecycleStatus === 'REVIEWING') {
+                        await this.publishCatalogDraft(manager, scope, task);
+                    }
+                    task.status = 'SUCCEEDED';
+                    progress.stage = 'SUCCEEDED';
+                    progress.observerStatus = 'COMPLETED';
+                    task.errorCode = null;
+                    task.errorMessage = null;
+                    task.completedAt = new Date();
+                }
+            }
+            else {
+                task.status = 'FAILED';
+                progress.stage = 'FAILED';
+                progress.observerStatus = 'FAILED';
+                task.errorCode = 'STALLED_CATALOG_DISCARDED';
+                task.errorMessage = '用户已明确放弃停滞目录批次，请重新导入源文件';
+                task.completedAt = new Date();
+                await this.failCatalogDraft(manager, scope, task, true);
+            }
+            await taskRepo.save(task);
+            return {
+                task: publicImportTaskDto(task),
+                batchCounts: {
+                    totalCount: batch.totalCount, successCount: batch.successCount, duplicateCount: batch.duplicateCount,
+                    invalidCount: batch.invalidCount, skippedCount: batch.skippedCount ?? 0
+                }
+            };
+        });
+        if (decision === 'PUBLISH_VALID_ROWS' && result.task.status === 'SUCCEEDED' && result.batchCounts.successCount > 0) {
+            if (result.task.documentType === 'CONTROLLED_CATALOG')
+                await this.recalculateProductRisks(scope, 'CATALOG_CHANGED', result.task.resultEntityId ?? undefined);
+            else
+                await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED', result.task.resultEntityId ?? undefined);
+        }
+        return result;
+    }
     async waitImportProgress(scope, taskId, afterProgressVersion = 0, waitMs = 10_000) {
         const deadline = Date.now() + Math.max(0, Math.min(waitMs, 10_000));
         while (true) {
@@ -1002,6 +1157,13 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             await repo.update({
                 ...activeScope(scope), importTaskId: taskId, status: 'LEASED', leaseExpiresAt: LessThanOrEqual(new Date())
             }, { status: 'PENDING', leaseToken: null, leaseExpiresAt: null });
+            const previousPendingCount = task.progress?.reviewPendingCount;
+            const pendingCount = await this.reconcileCatalogReviewPendingCount(repo, scope, task);
+            if (task.progress && previousPendingCount !== pendingCount) {
+                task.progress.progressVersion += 1;
+                task.progress.lastProgressAt = new Date().toISOString();
+                await manager.getRepository(ImportTask).save(task);
+            }
             const blocks = await repo.createQueryBuilder('block')
                 .setLock('pessimistic_write')
                 .setOnLocked('skip_locked')
@@ -1037,7 +1199,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         if (!leaseToken.trim() || items.length === 0 || items.length > CATALOG_REVIEW_BATCH_LIMIT) {
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, '复核提交参数无效');
         }
-        return this.dataSource.transaction(async (manager) => {
+        const result = await this.dataSource.transaction(async (manager) => {
             const taskRepo = manager.getRepository(ImportTask);
             const task = await required(taskRepo.findOne({
                 where: { ...activeScope(scope), id: taskId }, lock: { mode: 'pessimistic_write' }
@@ -1045,6 +1207,30 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (!task.progress || !task.resultEntityId)
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录复核任务状态无效');
             const reviewRepo = manager.getRepository(CatalogReviewBlock);
+            if (task.status === 'SUCCEEDED')
+                await this.assertCatalogBatchPublished(manager, scope, task);
+            const hasPriorReviewDecisions = task.progress.reviewResolvedCount > 0 || task.progress.reviewRejectedCount > 0;
+            const resolvedBlocks = task.status === 'SUCCEEDED' || hasPriorReviewDecisions
+                ? await reviewRepo.find({ where: {
+                        ...activeScope(scope), importTaskId: taskId, id: In(items.map(item => item.blockId)),
+                        status: In(['RESOLVED', 'REJECTED']), leaseToken
+                    } })
+                : [];
+            if (resolvedBlocks.length > 0 || task.status === 'SUCCEEDED') {
+                const matchingRetry = catalogReviewRetryMatches(resolvedBlocks, items);
+                if (!matchingRetry)
+                    throw new DomainError(DomainErrorCodes.INVALID_INPUT, '复核块租约无效或已过期');
+                const remaining = await this.reconcileCatalogReviewPendingCount(reviewRepo, scope, task);
+                if (task.status === 'SUCCEEDED' && remaining !== 0)
+                    throw new DomainError(DomainErrorCodes.INVALID_INPUT, '已发布目录仍存在待复核块');
+                return {
+                    resolved: items.filter(item => item.decision === 'ACCEPT').length,
+                    rejected: items.filter(item => item.decision === 'REJECT').length,
+                    remaining,
+                    errors: [],
+                    task: publicImportTaskDto(task)
+                };
+            }
             const blocks = await reviewRepo.find({ where: {
                     ...activeScope(scope), importTaskId: taskId, id: In(items.map(item => item.blockId)),
                     status: 'LEASED', leaseToken
@@ -1054,6 +1240,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             }
             const acceptedCandidates = [];
             const rejectedBlocks = [];
+            const errors = [];
             let resolved = 0;
             let rejected = 0;
             for (const item of items) {
@@ -1062,22 +1249,35 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     block.status = 'REJECTED';
                     rejectedBlocks.push(block);
                     rejected += 1;
+                    block.resolvedAt = new Date();
+                    block.leaseExpiresAt = null;
+                    block.resolutionFingerprint = catalogReviewResolutionFingerprint(item);
                 }
                 else {
-                    const payload = item.payload ? { ...block.payload, ...item.payload } : block.payload;
-                    const candidate = reviewCandidate(task.documentType, block, payload);
-                    const decision = classifyCandidate(candidate);
-                    if (decision.confidence === 'LOW') {
-                        throw new DomainError(DomainErrorCodes.INVALID_INPUT, `复核结果未通过代码校验：${decision.reasons.join(',')}`);
+                    const evaluation = evaluateCatalogReviewAccept(task.documentType, block, item.payload);
+                    if (!evaluation.candidate) {
+                        restorePendingReviewBlock(block);
+                        errors.push({ blockId: block.id, reasons: evaluation.reasons });
+                        continue;
+                    }
+                    let resolutionFingerprint;
+                    try {
+                        resolutionFingerprint = catalogReviewResolutionFingerprint(item);
                     }
+                    catch {
+                        restorePendingReviewBlock(block);
+                        errors.push({ blockId: block.id, reasons: ['REVIEW_PAYLOAD_INVALID'] });
+                        continue;
+                    }
+                    const candidate = evaluation.candidate;
                     acceptedCandidates.push(candidate);
-                    block.payload = payload;
+                    block.payload = candidate.values;
                     block.status = 'RESOLVED';
                     resolved += 1;
+                    block.resolvedAt = new Date();
+                    block.leaseExpiresAt = null;
+                    block.resolutionFingerprint = resolutionFingerprint;
                 }
-                block.resolvedAt = new Date();
-                block.leaseToken = null;
-                block.leaseExpiresAt = null;
             }
             if (task.documentType === 'CONTROLLED_CATALOG' && acceptedCandidates.length) {
                 const batchRepo = manager.getRepository(ControlledCatalogBatch);
@@ -1106,7 +1306,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             await reviewRepo.save(blocks);
             task.progress.reviewResolvedCount += resolved;
             task.progress.reviewRejectedCount += rejected;
-            task.progress.reviewPendingCount = Math.max(0, task.progress.reviewPendingCount - resolved - rejected);
+            await this.reconcileCatalogReviewPendingCount(reviewRepo, scope, task);
             task.progress.progressVersion += 1;
             task.progress.lastProgressAt = new Date().toISOString();
             if (task.progress.reviewPendingCount === 0) {
@@ -1121,6 +1321,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     await this.applyImportTaskFailure(manager, scope, task, 'FAILED', outcome.errorCode, outcome.errorMessage);
                 }
                 else {
+                    await this.publishCatalogDraft(manager, scope, task);
                     task.status = 'SUCCEEDED';
                     task.progress.stage = 'SUCCEEDED';
                     task.progress.observerStatus = 'COMPLETED';
@@ -1130,12 +1331,28 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 }
             }
             else {
+                await this.markCatalogDraftReviewing(manager, scope, task);
                 task.status = 'AWAITING_REVIEW';
                 task.progress.stage = 'REVIEWING';
             }
             await taskRepo.save(task);
-            return { resolved, rejected, remaining: task.progress.reviewPendingCount, task: publicImportTaskDto(task) };
+            return { resolved, rejected, remaining: task.progress.reviewPendingCount, errors, task: publicImportTaskDto(task) };
         });
+        if (result.task.status === 'SUCCEEDED' && (result.task.progress?.successCount ?? 0) > 0) {
+            if (result.task.documentType === 'CONTROLLED_CATALOG')
+                await this.recalculateProductRisks(scope, 'CATALOG_CHANGED', result.task.resultEntityId ?? undefined);
+            else
+                await this.recalculateCompanyRisks(scope, 'CATALOG_CHANGED', result.task.resultEntityId ?? undefined);
+        }
+        return result;
+    }
+    async reconcileCatalogReviewPendingCount(reviewRepo, scope, task) {
+        const pendingCount = await reviewRepo.count({ where: {
+                ...activeScope(scope), importTaskId: task.id, status: In(['PENDING', 'LEASED'])
+            } });
+        if (task.progress)
+            task.progress.reviewPendingCount = pendingCount;
+        return pendingCount;
     }
     async setImportObserverConversation(scope, taskId, conversationId) {
         const normalizedConversationId = requiredId(conversationId, '观察会话标识');
@@ -1156,12 +1373,12 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             return repo.save(task);
         });
     }
-    async appendFastSanctionCandidates(manager, scope, batchId, candidates) {
+    async appendFastSanctionCandidates(manager, scope, batchId, candidates, validatedBatch) {
         const batchRepo = manager.getRepository(SanctionCatalogBatch);
         const recordRepo = manager.getRepository(SanctionedCompanyRecord);
         const aliasRepo = manager.getRepository(SanctionedCompanyAlias);
         const issueRepo = manager.getRepository(SanctionCatalogImportIssue);
-        const batch = await required(batchRepo.findOne({ where: { ...activeScope(scope), id: batchId } }), '制裁目录批次不存在');
+        const batch = validatedBatch ?? await required(batchRepo.findOne({ where: { ...activeScope(scope), id: batchId } }), '制裁目录批次不存在');
         for (const candidate of candidates.filter(value => value.kind === 'SANCTION')) {
             const companyName = String(candidate.values.companyName ?? '').trim();
             const sourceLocation = candidate.evidence[0]?.sourceLocation ?? null;
@@ -1171,7 +1388,11 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const normalizedCompanyName = normalizeExactName(companyName);
             const sanctionListSource = optionalString(candidate.values.sanctionListSource);
             const normalizedSanctionListSource = normalizeSanctionSource(sanctionListSource);
-            const duplicate = await recordRepo.findOne({ where: { ...activeScope(scope), normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() } });
+            const duplicate = await recordRepo.findOne({ where: [
+                    { ...activeScope(scope), batchId: batch.id, lifecycleStatus: batch.lifecycleStatus, normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() },
+                    ...(batch.replacedBatchId ? [{ ...activeScope(scope), batchId: IsNull(), lifecycleStatus: 'ACTIVE', normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull() }] : []),
+                    { ...activeScope(scope), lifecycleStatus: 'ACTIVE', normalizedCompanyName, normalizedSanctionListSource, deletedAt: IsNull(), ...(batch.replacedBatchId ? { batchId: Not(batch.replacedBatchId) } : {}) }
+                ] });
             batch.totalCount += 1;
             if (duplicate) {
                 batch.duplicateCount += 1;
@@ -1183,7 +1404,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 continue;
             }
             const record = await recordRepo.save(recordRepo.create({
-                ...auditScope(scope), batchId: batch.id, sourceType: 'FILE_IMPORT', companyName, normalizedCompanyName,
+                ...auditScope(scope), batchId: batch.id, lifecycleStatus: batch.lifecycleStatus, sourceType: 'FILE_IMPORT', companyName, normalizedCompanyName,
                 countryOrRegion: optionalString(candidate.values.countryOrRegion), sanctionListSource,
                 normalizedSanctionListSource, sanctionReason: optionalString(candidate.values.sanctionReason),
                 effectiveDate: optionalString(candidate.values.effectiveDate), remarks: optionalString(candidate.values.remarks),
@@ -1248,6 +1469,34 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         }
         return batchRepo.save(batch);
     }
+    async appendStalledCatalogReviewIssues(manager, scope, task, batch, blocks) {
+        const issueRepo = (task.documentType === 'CONTROLLED_CATALOG'
+            ? manager.getRepository(ControlledCatalogImportIssue)
+            : manager.getRepository(SanctionCatalogImportIssue));
+        for (const block of blocks) {
+            const parsedPayload = {
+                reviewBlockId: block.id, reviewDecision: 'STALLED_RECOVERY_REJECT',
+                payload: block.payload, reasons: block.reasons
+            };
+            const existing = await issueRepo.findOne({ where: {
+                    ...activeScope(scope), batchId: batch.id, issueType: 'INVALID', parsedPayload
+                } });
+            if (existing)
+                continue;
+            batch.totalCount += 1;
+            batch.invalidCount += 1;
+            batch.skippedCount += 1;
+            await issueRepo.save(issueRepo.create({
+                ...createdScope(scope), batchId: batch.id, issueType: 'INVALID', sourceSequence: batch.totalCount,
+                sourceLocation: block.sourceLocation, sourceContent: block.sourceContent, parsedPayload,
+                message: `停滞目录恢复时跳过待复核来源行：${block.reasons.join(', ') || '未提供原因'}`
+            }));
+        }
+        if (task.documentType === 'CONTROLLED_CATALOG')
+            await manager.getRepository(ControlledCatalogBatch).save(batch);
+        else
+            await manager.getRepository(SanctionCatalogBatch).save(batch);
+    }
     async catalogBatchCounts(manager, scope, task) {
         if (!task.resultEntityId)
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录导入批次不存在');
@@ -1265,7 +1514,224 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             skippedCount: batch.skippedCount ?? 0
         };
     }
-    async rollbackFailedCatalogReplacement(manager, scope, task) {
+    async assertCatalogBatchPublished(manager, scope, task) {
+        if (!task.resultEntityId)
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录导入批次不存在');
+        if (task.documentType === 'CONTROLLED_CATALOG') {
+            await required(manager.getRepository(ControlledCatalogBatch).findOne({
+                where: { ...activeScope(scope), id: task.resultEntityId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
+                lock: { mode: 'pessimistic_write' }
+            }), '已发布管控目录批次不存在');
+            return;
+        }
+        if (task.documentType !== 'SANCTION_CATALOG')
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅目录任务支持发布');
+        await required(manager.getRepository(SanctionCatalogBatch).findOne({
+            where: { ...activeScope(scope), id: task.resultEntityId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
+            lock: { mode: 'pessimistic_write' }
+        }), '已发布制裁目录批次不存在');
+    }
+    async markCatalogDraftReviewing(manager, scope, task) {
+        if (!task.resultEntityId)
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录导入批次不存在');
+        if (task.documentType === 'CONTROLLED_CATALOG') {
+            const batchRepo = manager.getRepository(ControlledCatalogBatch);
+            const batch = await required(batchRepo.findOne({
+                where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+            }), '管控目录批次不存在');
+            if (batch.lifecycleStatus !== 'DRAFT' && batch.lifecycleStatus !== 'REVIEWING') {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '管控目录草稿状态无效');
+            }
+            const previousStatus = batch.lifecycleStatus;
+            batch.lifecycleStatus = 'REVIEWING';
+            batch.updatedById = scope.userId ?? null;
+            await batchRepo.save(batch);
+            await manager.getRepository(ControlledGoodsRecord).update({
+                ...activeScope(scope), batchId: batch.id, lifecycleStatus: previousStatus, deletedAt: IsNull()
+            }, { lifecycleStatus: 'REVIEWING', updatedById: scope.userId ?? null });
+            return;
+        }
+        const batchRepo = manager.getRepository(SanctionCatalogBatch);
+        const batch = await required(batchRepo.findOne({
+            where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+        }), '制裁目录批次不存在');
+        if (batch.lifecycleStatus !== 'DRAFT' && batch.lifecycleStatus !== 'REVIEWING') {
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '制裁目录草稿状态无效');
+        }
+        const previousStatus = batch.lifecycleStatus;
+        batch.lifecycleStatus = 'REVIEWING';
+        batch.updatedById = scope.userId ?? null;
+        await batchRepo.save(batch);
+        await manager.getRepository(SanctionedCompanyRecord).update({
+            ...activeScope(scope), batchId: batch.id, lifecycleStatus: previousStatus, deletedAt: IsNull()
+        }, { lifecycleStatus: 'REVIEWING', updatedById: scope.userId ?? null });
+    }
+    async publishCatalogDraft(manager, scope, task) {
+        if (!task.resultEntityId)
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '目录导入批次不存在');
+        await lockCatalogMutation(manager, scope, this.dataSource.options?.type === 'postgres');
+        const now = new Date();
+        if (task.documentType === 'CONTROLLED_CATALOG') {
+            const batchRepo = manager.getRepository(ControlledCatalogBatch);
+            const recordRepo = manager.getRepository(ControlledGoodsRecord);
+            const batch = await required(batchRepo.findOne({
+                where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+            }), '管控目录批次不存在');
+            if (batch.lifecycleStatus !== 'DRAFT' && batch.lifecycleStatus !== 'REVIEWING') {
+                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '管控目录草稿状态无效');
+            }
+            await this.reclassifyControlledPublishConflicts(manager, scope, batch, now);
+            if (batch.replacedBatchId) {
+                const replaced = await required(batchRepo.findOne({
+                    where: { ...activeScope(scope), id: batch.replacedBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
+                    lock: { mode: 'pessimistic_write' }
+                }), '被覆盖目录批次不存在');
+                replaced.deletedAt = now;
+                replaced.deletedById = scope.userId ?? null;
+                replaced.deleteOperation = 'CATALOG_REPLACE';
+                replaced.updatedById = scope.userId ?? null;
+                await batchRepo.save(replaced);
+                await recordRepo.update({
+                    ...activeScope(scope), batchId: replaced.id, lifecycleStatus: 'ACTIVE', deletedAt: IsNull()
+                }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'CATALOG_REPLACE', updatedById: scope.userId ?? null });
+            }
+            const previousStatus = batch.lifecycleStatus;
+            batch.lifecycleStatus = 'ACTIVE';
+            batch.updatedById = scope.userId ?? null;
+            await batchRepo.save(batch);
+            await recordRepo.update({
+                ...activeScope(scope), batchId: batch.id, lifecycleStatus: previousStatus, deletedAt: IsNull()
+            }, { lifecycleStatus: 'ACTIVE', updatedById: scope.userId ?? null });
+            this.synchronizeCatalogTaskCounts(task, batch);
+            return;
+        }
+        if (task.documentType !== 'SANCTION_CATALOG')
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅目录任务支持发布');
+        const batchRepo = manager.getRepository(SanctionCatalogBatch);
+        const recordRepo = manager.getRepository(SanctionedCompanyRecord);
+        const aliasRepo = manager.getRepository(SanctionedCompanyAlias);
+        const batch = await required(batchRepo.findOne({
+            where: { ...activeScope(scope), id: task.resultEntityId }, lock: { mode: 'pessimistic_write' }
+        }), '制裁目录批次不存在');
+        if (batch.lifecycleStatus !== 'DRAFT' && batch.lifecycleStatus !== 'REVIEWING') {
+            throw new DomainError(DomainErrorCodes.INVALID_INPUT, '制裁目录草稿状态无效');
+        }
+        await this.reclassifySanctionPublishConflicts(manager, scope, batch, now);
+        if (batch.replacedBatchId) {
+            const replaced = await required(batchRepo.findOne({
+                where: { ...activeScope(scope), id: batch.replacedBatchId, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
+                lock: { mode: 'pessimistic_write' }
+            }), '被覆盖制裁目录批次不存在');
+            replaced.deletedAt = now;
+            replaced.deletedById = scope.userId ?? null;
+            replaced.deleteOperation = 'SANCTION_CATALOG_REPLACE';
+            replaced.updatedById = scope.userId ?? null;
+            await batchRepo.save(replaced);
+            const replacedRecords = await recordRepo.find({
+                where: { ...activeScope(scope), batchId: replaced.id, lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
+                select: { id: true }
+            });
+            if (replacedRecords.length > 0) {
+                await aliasRepo.update({
+                    ...activeScope(scope), sanctionedCompanyId: In(replacedRecords.map(record => record.id)), deletedAt: IsNull()
+                }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'SANCTION_CATALOG_REPLACE', updatedById: scope.userId ?? null });
+            }
+            await recordRepo.update({
+                ...activeScope(scope), batchId: replaced.id, lifecycleStatus: 'ACTIVE', deletedAt: IsNull()
+            }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'SANCTION_CATALOG_REPLACE', updatedById: scope.userId ?? null });
+        }
+        const previousStatus = batch.lifecycleStatus;
+        batch.lifecycleStatus = 'ACTIVE';
+        batch.updatedById = scope.userId ?? null;
+        await batchRepo.save(batch);
+        await recordRepo.update({
+            ...activeScope(scope), batchId: batch.id, lifecycleStatus: previousStatus, deletedAt: IsNull()
+        }, { lifecycleStatus: 'ACTIVE', updatedById: scope.userId ?? null });
+        this.synchronizeCatalogTaskCounts(task, batch);
+    }
+    synchronizeCatalogTaskCounts(task, batch) {
+        if (!task.progress)
+            return;
+        task.progress.successCount = batch.successCount;
+        task.progress.duplicateCount = batch.duplicateCount;
+        task.progress.invalidCount = batch.invalidCount;
+        task.progress.skippedCount = batch.skippedCount;
+    }
+    async reclassifyControlledPublishConflicts(manager, scope, batch, now) {
+        const recordRepo = manager.getRepository(ControlledGoodsRecord);
+        const issueRepo = manager.getRepository(ControlledCatalogImportIssue);
+        const drafts = await recordRepo.find({
+            where: { ...activeScope(scope), batchId: batch.id, lifecycleStatus: In(['DRAFT', 'REVIEWING']), deletedAt: IsNull() }
+        });
+        for (const record of drafts) {
+            const conflictWhere = {
+                ...activeScope(scope), lifecycleStatus: 'ACTIVE', catalogType: record.catalogType,
+                normalizedProductName: record.normalizedProductName, normalizedHsCode: record.normalizedHsCode,
+                deletedAt: IsNull()
+            };
+            const conflict = await recordRepo.findOne({ where: batch.replacedBatchId
+                    ? [{ ...conflictWhere, batchId: IsNull() }, { ...conflictWhere, batchId: Not(batch.replacedBatchId) }]
+                    : conflictWhere });
+            if (!conflict)
+                continue;
+            batch.successCount = Math.max(0, batch.successCount - 1);
+            batch.duplicateCount += 1;
+            await issueRepo.save(issueRepo.create({
+                ...createdScope(scope), batchId: batch.id, issueType: 'DUPLICATE',
+                sourceSequence: Math.max(1, batch.totalCount - batch.successCount),
+                sourceLocation: record.sourceLocation, sourceContent: record.sourceContent,
+                parsedPayload: {
+                    catalogType: record.catalogType, productName: record.productName, hsCode: record.hsCode
+                },
+                message: '发布前检测到相同商品名称和海关编码的活动记录'
+            }));
+            await recordRepo.update({ ...activeScope(scope), id: record.id }, {
+                lifecycleStatus: 'FAILED', deletedAt: now, deletedById: scope.userId ?? null,
+                deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null
+            });
+        }
+    }
+    async reclassifySanctionPublishConflicts(manager, scope, batch, now) {
+        const recordRepo = manager.getRepository(SanctionedCompanyRecord);
+        const issueRepo = manager.getRepository(SanctionCatalogImportIssue);
+        const aliasRepo = manager.getRepository(SanctionedCompanyAlias);
+        const drafts = await recordRepo.find({
+            where: { ...activeScope(scope), batchId: batch.id, lifecycleStatus: In(['DRAFT', 'REVIEWING']), deletedAt: IsNull() }
+        });
+        for (const record of drafts) {
+            const conflictWhere = {
+                ...activeScope(scope), lifecycleStatus: 'ACTIVE', normalizedCompanyName: record.normalizedCompanyName,
+                normalizedSanctionListSource: record.normalizedSanctionListSource, deletedAt: IsNull()
+            };
+            const conflict = await recordRepo.findOne({ where: batch.replacedBatchId
+                    ? [{ ...conflictWhere, batchId: IsNull() }, { ...conflictWhere, batchId: Not(batch.replacedBatchId) }]
+                    : conflictWhere });
+            if (!conflict)
+                continue;
+            batch.successCount = Math.max(0, batch.successCount - 1);
+            batch.duplicateCount += 1;
+            await issueRepo.save(issueRepo.create({
+                ...createdScope(scope), batchId: batch.id, issueType: 'DUPLICATE',
+                sourceSequence: Math.max(1, batch.totalCount - batch.successCount),
+                sourceLocation: record.sourceLocation, sourceContent: record.sourceContent,
+                parsedPayload: {
+                    companyName: record.companyName, sanctionListSource: record.sanctionListSource
+                },
+                message: '发布前检测到相同公司和名单来源的活动记录'
+            }));
+            await aliasRepo.update({
+                ...activeScope(scope), sanctionedCompanyId: record.id, deletedAt: IsNull()
+            }, {
+                deletedAt: now, deletedById: scope.userId ?? null,
+                deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null
+            });
+            await recordRepo.update({ ...activeScope(scope), id: record.id }, {
+                lifecycleStatus: 'FAILED', deletedAt: now, deletedById: scope.userId ?? null,
+                deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null
+            });
+        }
+    }
+    async failCatalogDraft(manager, scope, task, allowActive = false) {
         if (!task.resultEntityId || (task.documentType !== 'CONTROLLED_CATALOG' && task.documentType !== 'SANCTION_CATALOG'))
             return;
         const now = new Date();
@@ -1273,11 +1739,9 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const batchRepo = manager.getRepository(ControlledCatalogBatch);
             const recordRepo = manager.getRepository(ControlledGoodsRecord);
             const current = await batchRepo.findOne({ where: { ...activeScope(scope), id: task.resultEntityId } });
-            if (!current?.replacedBatchId)
-                return;
-            const replaced = await batchRepo.findOne({ where: { ...activeScope(scope), id: current.replacedBatchId } });
-            if (!replaced || replaced.deleteOperation !== 'CATALOG_REPLACE')
+            if (!current || (current.lifecycleStatus !== 'DRAFT' && current.lifecycleStatus !== 'REVIEWING' && (!allowActive || current.lifecycleStatus !== 'ACTIVE')))
                 return;
+            current.lifecycleStatus = 'FAILED';
             current.deletedAt = now;
             current.deletedById = scope.userId ?? null;
             current.deleteOperation = 'IMPORT_FAILED';
@@ -1285,26 +1749,16 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             await batchRepo.save(current);
             await recordRepo.update({
                 ...activeScope(scope), batchId: current.id, deletedAt: IsNull()
-            }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null });
-            replaced.deletedAt = null;
-            replaced.deletedById = null;
-            replaced.deleteOperation = null;
-            replaced.updatedById = scope.userId ?? null;
-            await batchRepo.save(replaced);
-            await recordRepo.update({
-                ...activeScope(scope), batchId: replaced.id, deleteOperation: 'CATALOG_REPLACE'
-            }, { deletedAt: null, deletedById: null, deleteOperation: null, updatedById: scope.userId ?? null });
+            }, { lifecycleStatus: 'FAILED', deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null });
             return;
         }
         const batchRepo = manager.getRepository(SanctionCatalogBatch);
         const recordRepo = manager.getRepository(SanctionedCompanyRecord);
         const aliasRepo = manager.getRepository(SanctionedCompanyAlias);
         const current = await batchRepo.findOne({ where: { ...activeScope(scope), id: task.resultEntityId } });
-        if (!current?.replacedBatchId)
-            return;
-        const replaced = await batchRepo.findOne({ where: { ...activeScope(scope), id: current.replacedBatchId } });
-        if (!replaced || replaced.deleteOperation !== 'SANCTION_CATALOG_REPLACE')
+        if (!current || (current.lifecycleStatus !== 'DRAFT' && current.lifecycleStatus !== 'REVIEWING' && (!allowActive || current.lifecycleStatus !== 'ACTIVE')))
             return;
+        current.lifecycleStatus = 'FAILED';
         current.deletedAt = now;
         current.deletedById = scope.userId ?? null;
         current.deleteOperation = 'IMPORT_FAILED';
@@ -1320,15 +1774,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         }
         await recordRepo.update({
             ...activeScope(scope), batchId: current.id, deletedAt: IsNull()
-        }, { deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null });
-        replaced.deletedAt = null;
-        replaced.deletedById = null;
-        replaced.deleteOperation = null;
-        replaced.updatedById = scope.userId ?? null;
-        await batchRepo.save(replaced);
-        await recordRepo.update({
-            ...activeScope(scope), batchId: replaced.id, deleteOperation: 'SANCTION_CATALOG_REPLACE'
-        }, { deletedAt: null, deletedById: null, deleteOperation: null, updatedById: scope.userId ?? null });
+        }, { lifecycleStatus: 'FAILED', deletedAt: now, deletedById: scope.userId ?? null, deleteOperation: 'IMPORT_FAILED', updatedById: scope.userId ?? null });
     }
     async applyImportTaskFailure(manager, scope, task, status, errorCode, errorMessage, completedAt = new Date()) {
         task.status = status;
@@ -1338,7 +1784,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         if (task.progress?.mode === 'FAST_PIPELINE') {
             task.progress.stage = 'FAILED';
             task.progress.observerStatus = 'FAILED';
-            await this.rollbackFailedCatalogReplacement(manager, scope, task);
+            await this.failCatalogDraft(manager, scope, task);
         }
     }
     async createImportTask(scope, input) {
@@ -1723,8 +2169,15 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return this.dataSource.transaction(async (manager) => {
             const repo = manager.getRepository(ImportTask);
             const task = await required(repo.findOne({ where: { ...activeScope(scope), id }, lock: { mode: 'pessimistic_write' } }), '解析任务不存在');
-            if (task.status === 'AWAITING_REVIEW')
-                return task;
+            if (task.status === 'AWAITING_REVIEW') {
+                const replaceablePurchaseDraft = task.documentType === 'PURCHASE_CONTRACT' && task.resultEntityId == null && version === 'PURCHASE_DRAFT_V1';
+                if (!replaceablePurchaseDraft || canonicalJson(task.resultPayload ?? null) === canonicalJson(payload))
+                    return task;
+                task.resultPayload = payload;
+                task.resultPayloadVersion = version;
+                task.completedAt = new Date();
+                return repo.save(task);
+            }
             assertImportTaskResultWritable(task);
             await invalidateCustomerContractReanalysis(manager, scope, { reviewSource: 'IMPORT_DRAFT', task });
             task.resultPayload = payload;
@@ -1770,7 +2223,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const lineRepo = manager.getRepository(PurchaseOrderLine);
             for (let index = 0; index < draft.lines.length; index += 1) {
                 const line = draft.lines[index];
-                await lineRepo.save(lineRepo.create({ ...auditScope(scope), purchaseOrderId: entity.id, lineNumber: line.lineNumber ?? index + 1, sourceType: line.sourceType ?? 'CONTRACT_EXTRACTED', productName: line.productName.trim(), normalizedProductName: normalizeForProductMatch(line.productName), englishName: line.englishName ?? null, englishNameSource: line.englishNameSource ?? null, productDescription: line.productDescription ?? null, modelSpecification: line.modelSpecification ?? null, unit: line.unit ?? null, quantity: defaultDecimalText(line.quantity), unitPriceTaxIncluded: defaultDecimalText(line.unitPriceTaxIncluded), lineAmountTaxIncluded: defaultDecimalText(line.lineAmountTaxIncluded), vatRate: optionalString(line.vatRate), vatRateSource: line.vatRateSource ?? null, hsCode: line.hsCode ?? null, hsCodeStatus: line.hsCodeStatus ?? 'UNCONFIRMED', hsCodeSource: line.hsCodeSource ?? null, hsCodeReferenceSnapshotId: line.hsCodeReferenceSnapshotId ?? null, originCountry: line.originCountry ?? null, domesticSourceLocation: line.domesticSourceLocation ?? null, refundRate: optionalString(line.refundRate), refundRateSource: line.refundRateSource ?? null, refundPolicyReference: line.refundPolicyReference ?? null, refundPolicyDate: optionalString(line.refundPolicyDate), refundValidationMethod: line.refundValidationMethod ?? null, refundConfirmedAt: confirmedAt, refundConfirmedById: confirmedById, amountMismatchConfirmedAt: line.amountMismatch === true ? confirmedAt : null, amountMismatchConfirmedById: line.amountMismatch === true ? confirmedById : null, sourceLocation: line.sourceLocation ?? null, sourceContent: line.sourceContent ?? null }));
+                await lineRepo.save(lineRepo.create({ ...auditScope(scope), purchaseOrderId: entity.id, lineNumber: line.lineNumber ?? index + 1, sourceType: line.sourceType ?? 'CONTRACT_EXTRACTED', productName: line.productName.trim(), normalizedProductName: normalizeForProductMatch(line.productName), englishName: line.englishName ?? null, englishNameSource: line.englishNameSource ?? null, productDescription: line.productDescription ?? null, modelSpecification: line.modelSpecification ?? null, unit: line.unit ?? null, quantity: defaultDecimalText(line.quantity), unitPriceTaxIncluded: defaultDecimalText(line.unitPriceTaxIncluded), lineAmountTaxIncluded: purchaseLineAmountText(line), vatRate: optionalString(line.vatRate), vatRateSource: line.vatRateSource ?? null, hsCode: line.hsCode ?? null, hsCodeStatus: line.hsCodeStatus ?? 'UNCONFIRMED', hsCodeSource: line.hsCodeSource ?? null, hsCodeReferenceSnapshotId: line.hsCodeReferenceSnapshotId ?? null, originCountry: line.originCountry ?? null, domesticSourceLocation: line.domesticSourceLocation ?? null, refundRate: optionalString(line.refundRate), refundRateSource: line.refundRateSource ?? null, refundPolicyReference: line.refundPolicyReference ?? null, refundPolicyDate: optionalString(line.refundPolicyDate), refundValidationMethod: line.refundValidationMethod ?? null, refundConfirmedAt: confirmedAt, refundConfirmedById: confirmedById, amountMismatchConfirmedAt: line.amountMismatch === true ? confirmedAt : null, amountMismatchConfirmedById: line.amountMismatch === true ? confirmedById : null, sourceLocation: line.sourceLocation ?? null, sourceContent: line.sourceContent ?? null }));
             }
             task.status = 'SUCCEEDED';
             task.resultEntityId = entity.id;
@@ -1845,7 +2298,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const currentOrders = orders.filter(order => String(order.orderDate ?? '').startsWith(`${currentYear}-`));
         const top = new Map();
         for (const line of lines)
-            top.set(line.productName, (top.get(line.productName) ?? new Decimal(0)).plus(line.lineAmountTaxIncluded));
+            top.set(line.productName, (top.get(line.productName) ?? new Decimal(0)).plus(purchaseLineMetricAmount(line)));
         const orderBalances = {};
         for (const order of orders) {
             const orderLines = lines.filter(line => line.purchaseOrderId === order.id);
@@ -1896,6 +2349,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const saved = await this.withLockedPurchaseLines(scope, existing.purchaseOrderId, async ({ lineRepo, lines, contracts, customers, manuals }) => {
             const item = await required(Promise.resolve(lines.find(line => line.id === id) ?? null), '采购商品不存在');
             Object.assign(item, pick(input, ['productName', 'englishName', 'englishNameSource', 'productDescription', 'modelSpecification', 'unit', 'quantity', 'unitPriceTaxIncluded', 'lineAmountTaxIncluded', 'vatRate', 'vatRateSource', 'hsCode', 'hsCodeStatus', 'hsCodeSource', 'originCountry', 'domesticSourceLocation', 'refundRate', 'refundRateSource', 'refundPolicyReference', 'refundPolicyDate', 'refundValidationMethod']));
+            item.lineAmountTaxIncluded = purchaseLineAmountText(item);
             validatePurchaseLineDiscriminators(item);
             const rates = validateTaxRates(item, { purchaseOrderLineId: item.id, lineNumber: item.lineNumber, productName: item.productName });
             item.vatRate = rates.vatRate;
@@ -1918,7 +2372,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, '采购商品数量必须大于 0');
         const saved = await this.withLockedPurchaseLines(scope, purchaseOrderId, async ({ lineRepo, lines, contracts, customers, manuals }) => {
             const lineNumber = lines.reduce((maximum, line) => Math.max(maximum, line.lineNumber), 0) + 1;
-            const item = lineRepo.create({ ...auditScope(scope), purchaseOrderId, lineNumber, sourceType: discriminators.sourceType ?? 'MANUAL_ENTRY', productName: input.productName.trim(), normalizedProductName: normalizeForProductMatch(input.productName), englishName: input.englishName ?? null, englishNameSource: discriminators.englishNameSource ?? null, productDescription: input.productDescription ?? null, modelSpecification: input.modelSpecification ?? null, unit: input.unit ?? null, quantity: input.quantity, unitPriceTaxIncluded: input.unitPriceTaxIncluded, lineAmountTaxIncluded: input.lineAmountTaxIncluded, vatRate: rates.vatRate, vatRateSource: discriminators.vatRateSource ?? 'MANUAL', hsCode: input.hsCode ?? null, hsCodeStatus: discriminators.hsCodeStatus ?? 'UNCONFIRMED', hsCodeSource: discriminators.hsCodeSource ?? null, hsCodeReferenceSnapshotId: null, originCountry: input.originCountry ?? null, domesticSourceLocation: input.domesticSourceLocation ?? null, refundRate: rates.refundRate, refundRateSource: discriminators.refundRateSource ?? null, refundPolicyReference: input.refundPolicyReference ?? null, refundPolicyDate: input.refundPolicyDate ?? null, refundValidationMethod: discriminators.refundValidationMethod ?? null, refundConfirmedAt: null, refundConfirmedById: null, amountMismatchConfirmedAt: null, amountMismatchConfirmedById: null, sourceLocation: null, sourceContent: null });
+            const item = lineRepo.create({ ...auditScope(scope), purchaseOrderId, lineNumber, sourceType: discriminators.sourceType ?? 'MANUAL_ENTRY', productName: input.productName.trim(), normalizedProductName: normalizeForProductMatch(input.productName), englishName: input.englishName ?? null, englishNameSource: discriminators.englishNameSource ?? null, productDescription: input.productDescription ?? null, modelSpecification: input.modelSpecification ?? null, unit: input.unit ?? null, quantity: input.quantity, unitPriceTaxIncluded: input.unitPriceTaxIncluded, lineAmountTaxIncluded: purchaseLineAmountText(input), vatRate: rates.vatRate, vatRateSource: discriminators.vatRateSource ?? 'MANUAL', hsCode: input.hsCode ?? null, hsCodeStatus: discriminators.hsCodeStatus ?? 'UNCONFIRMED', hsCodeSource: discriminators.hsCodeSource ?? null, hsCodeReferenceSnapshotId: null, originCountry: input.originCountry ?? null, domesticSourceLocation: input.domesticSourceLocation ?? null, refundRate: rates.refundRate, refundRateSource: discriminators.refundRateSource ?? null, refundPolicyReference: input.refundPolicyReference ?? null, refundPolicyDate: input.refundPolicyDate ?? null, refundValidationMethod: discriminators.refundValidationMethod ?? null, refundConfirmedAt: null, refundConfirmedById: null, amountMismatchConfirmedAt: null, amountMismatchConfirmedById: null, sourceLocation: null, sourceContent: null });
             this.assertLockedPurchaseReceipts([...lines, item], contracts, customers, manuals);
             return lineRepo.save(item);
         });
@@ -2527,7 +2981,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const linesByPurchase = groupBy(lines, line => line.purchaseOrderId);
         const riskRows = lines.length ? await this.dataSource.getRepository(ProductComplianceMatch).find({ where: { ...activeScope(scope), purchaseOrderLineId: In(lines.map(line => line.id)), deletedAt: IsNull() } }) : [];
         const controlledGoodsIds = [...new Set(riskRows.map(match => match.controlledGoodsId))];
-        const controlledGoods = controlledGoodsIds.length ? await this.dataSource.getRepository(ControlledGoodsRecord).find({ where: { ...activeScope(scope), id: In(controlledGoodsIds), deletedAt: IsNull() } }) : [];
+        const controlledGoods = controlledGoodsIds.length ? await this.dataSource.getRepository(ControlledGoodsRecord).find({ where: { ...activeScope(scope), id: In(controlledGoodsIds), lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }) : [];
         const controlledGoodsById = new Map(controlledGoods.map(item => [item.id, item]));
         const risksByLine = groupBy(riskRows, match => match.purchaseOrderLineId);
         const purchasesByBaseCode = groupBy(purchases, purchase => parsePurchaseContractNo(purchase.contractNo).baseCode);
@@ -2718,7 +3172,8 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     throw new DomainError(DomainErrorCodes.INVALID_INPUT, '供应商存在有效采购订单，不能删除', { orderCount: count });
             }
             const repo = manager.getRepository(entity);
-            const target = await required(repo.findOne({ where: { ...activeScope(scope), id, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '记录不存在');
+            const lifecycle = entity === ControlledGoodsRecord || entity === SanctionedCompanyRecord ? { lifecycleStatus: 'ACTIVE' } : {};
+            const target = await required(repo.findOne({ where: { ...activeScope(scope), id, ...lifecycle, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '记录不存在');
             const now = new Date();
             target.deletedAt = now;
             target.deletedById = scope.userId ?? null;
@@ -3094,7 +3549,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             });
             await matchRepo.update({ ...activeScope(scope), deletedAt: IsNull() }, { deletedAt: now, invalidationReason: reason });
             const goods = await manager.getRepository(ControlledGoodsRecord).find({
-                where: { ...activeScope(scope), deletedAt: IsNull() },
+                where: { ...activeScope(scope), lifecycleStatus: 'ACTIVE', deletedAt: IsNull() },
                 order: { id: 'ASC' },
                 lock: { mode: 'pessimistic_read' }
             });
@@ -3118,17 +3573,28 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             return { scanned: lines.length, matches };
         });
     }
-    async recalculateCompanyRisks(scope, reason) {
+    async recalculateCompanyRisks(scope, reason, sanctionBatchId) {
         return this.dataSource.transaction(async (manager) => {
             const repo = manager.getRepository(CompanySanctionMatch);
             const supplierRepo = manager.getRepository(Supplier);
             const customerRepo = manager.getRepository(Customer);
             const now = new Date();
+            if (this.dataSource.options?.type === 'postgres') {
+                await manager.query('SELECT pg_advisory_xact_lock(hashtext($1), hashtext($2))', [`trade-compliance:company-risk:${scope.tenantId}:${scope.organizationId}`, 'recalculate']);
+            }
+            const sanctionBatch = sanctionBatchId
+                ? await required(manager.getRepository(SanctionCatalogBatch).findOne({
+                    where: { ...activeScope(scope), id: sanctionBatchId }, lock: { mode: 'pessimistic_write' }
+                }), '制裁目录批次不存在')
+                : null;
+            if (sanctionBatch?.riskRecalculatedAt) {
+                return { scanned: 0, matches: 0, riskRecalculatedAt: sanctionBatch.riskRecalculatedAt };
+            }
             await repo.update({ ...activeScope(scope), deletedAt: IsNull() }, { deletedAt: now, invalidationReason: reason });
             const [suppliers, customers, sanctions, aliases] = await Promise.all([
                 supplierRepo.find({ where: { ...activeScope(scope), deletedAt: IsNull() } }),
                 customerRepo.find({ where: { ...activeScope(scope), deletedAt: IsNull() } }),
-                manager.getRepository(SanctionedCompanyRecord).find({ where: { ...activeScope(scope), deletedAt: IsNull() } }),
+                manager.getRepository(SanctionedCompanyRecord).find({ where: { ...activeScope(scope), lifecycleStatus: 'ACTIVE', deletedAt: IsNull() } }),
                 manager.getRepository(SanctionedCompanyAlias).find({ where: { ...activeScope(scope), deletedAt: IsNull() } })
             ]);
             const sanctionsById = new Map(sanctions.map(item => [item.id, item]));
@@ -3150,7 +3616,14 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     await repo.save(repo.create({ ...createdScope(scope), subjectType: 'CUSTOMER', supplierId: null, customerId: customer.id, sanctionedCompanyId: item.id, matchedNormalizedName: customer.normalizedName, checkedAt: now, deletedAt: null, invalidationReason: null }));
                 await customerRepo.update({ ...activeScope(scope), id: customer.id, deletedAt: IsNull() }, { complianceCheckStatus: 'CHECKED', complianceCheckedAt: now, updatedById: scope.userId ?? null, updatedAt: now });
             }
-            return { scanned: suppliers.length + customers.length, matches: await repo.count({ where: { ...activeScope(scope), deletedAt: IsNull() } }) };
+            const matches = await repo.count({ where: { ...activeScope(scope), deletedAt: IsNull() } });
+            if (sanctionBatch) {
+                sanctionBatch.riskRecalculatedAt = now;
+                sanctionBatch.updatedById = scope.userId ?? null;
+                await manager.getRepository(SanctionCatalogBatch).save(sanctionBatch);
+                return { scanned: suppliers.length + customers.length, matches, riskRecalculatedAt: now };
+            }
+            return { scanned: suppliers.length + customers.length, matches };
         });
     }
     async pagedQuery(entity, scope, query, searchFields, exactFilters = {}, filters = {}) {
@@ -3189,7 +3662,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         if (catalogBatchId)
             qb.andWhere('row.batchId = :catalogBatchId', { catalogBatchId });
         else
-            qb.andWhere('row.deletedAt IS NULL');
+            qb.andWhere('row.deletedAt IS NULL').andWhere("row.lifecycleStatus = 'ACTIVE'");
         for (const [key, value] of Object.entries(filters.exact ?? {}))
             if (hasQueryValue(value))
                 qb.andWhere(`row.${key} = :exact_${key}`, { [`exact_${key}`]: value });
@@ -3459,6 +3932,14 @@ function handoffCallbackIdentityMatches(input, expectedSourceMessageId, persiste
 async function lockOrganizationTaskClaim(manager, scope) {
     await manager.query('SELECT pg_advisory_xact_lock(hashtext($1), hashtext($2))', [scope.tenantId, scope.organizationId]);
 }
+async function lockCatalogMutation(manager, scope, enabled) {
+    if (!enabled)
+        return;
+    await manager.query('SELECT pg_advisory_xact_lock(hashtext($1), hashtext($2))', [
+        `trade-compliance:catalog:${scope.tenantId}:${scope.organizationId}`,
+        'mutate'
+    ]);
+}
 async function organizationHasActiveParsing(manager, scope) {
     const activeImport = await manager.getRepository(ImportTask).findOne({
         where: { ...activeScope(scope), status: In([...RUNNING_IMPORT_TASK_STATUSES]), deletedAt: IsNull() },
@@ -3676,10 +4157,6 @@ function assertOptionalEnum(value, allowed, label) { if (hasQueryValue(value) &&
     throw new DomainError(DomainErrorCodes.INVALID_INPUT, `${label}无效`); }
 function fuzzyValue(value, filter) { return !hasQueryValue(filter) || String(value ?? '').toLocaleLowerCase().includes(String(filter).trim().toLocaleLowerCase()); }
 function pageRows(rows, query) { const pageSize = Math.min(200, Math.max(1, Number(query.pageSize ?? 20))); const pageCount = Math.max(1, Math.ceil(rows.length / pageSize)); const page = Math.min(pageCount, Math.max(1, Number(query.page ?? 1))); return { items: rows.slice((page - 1) * pageSize, page * pageSize), total: rows.length, page, pageSize }; }
-function filterSalesOrders(rows, parameters, includeParties = false) {
-    const date = parameters.orderDate && typeof parameters.orderDate === 'object' && !Array.isArray(parameters.orderDate) ? parameters.orderDate : {};
-    return rows.filter(row => fuzzyValue(row.salesOrderNo, parameters.salesOrderNo) && fuzzyValue(row.customerContractNo, parameters.customerContractNo) && fuzzyValue(row.purchaseContractNo, parameters.purchaseContractNo) && (!includeParties || fuzzyValue(row.supplierName, parameters.supplierName) && fuzzyValue(row.customerName, parameters.customerName)) && (!hasQueryValue(parameters.paymentStatus) || row.paymentStatus === parameters.paymentStatus) && (!hasQueryValue(date.from) || String(row.orderDate ?? '') >= String(date.from)) && (!hasQueryValue(date.to) || String(row.orderDate ?? '') <= String(date.to)));
-}
 function salesMetrics(rows) {
     const currentYear = String(new Date().getFullYear());
     const currentYearRows = rows.filter(row => String(row.orderDate ?? '').slice(0, 4) === currentYear);
@@ -3785,7 +4262,7 @@ function assertPurchaseDraft(draft) {
             throw new DomainError(DomainErrorCodes.INVALID_INPUT, `${prefix}名称为必填项`);
         const quantity = optionalDecimalInput(line.quantity, `${prefix}数量必须为有效数值`);
         const unitPrice = optionalDecimalInput(line.unitPriceTaxIncluded, `${prefix}含税单价必须为有效金额`);
-        const lineAmount = optionalDecimalInput(line.lineAmountTaxIncluded, `${prefix}含税金额必须为有效金额`);
+        const lineAmount = optionalDecimalInput(purchaseLineAmountText(line), `${prefix}含税金额必须为有效金额`);
         validateOptionalTaxRate(line.vatRate, 'vatRate', '增值税率', { lineNumber: index + 1, productName: line.productName });
         const refundRate = validateOptionalTaxRate(line.refundRate, 'refundRate', '退税率', { lineNumber: index + 1, productName: line.productName });
         if (hasQueryValue(line.refundPolicyDate) && hasQueryValue(draft.order.orderDate) && String(line.refundPolicyDate) > String(draft.order.orderDate))
@@ -3828,6 +4305,21 @@ function optionalDecimalInput(value, message) {
 function defaultDecimalText(value) {
     return optionalDecimalInput(value, '数值必须是有限金额')?.toString() ?? '0';
 }
+function purchaseLineAmountText(line) {
+    if (hasQueryValue(line.lineAmountTaxIncluded))
+        return defaultDecimalText(line.lineAmountTaxIncluded);
+    const quantity = optionalDecimalInput(line.quantity, '采购商品数量必须为有效数值');
+    const unitPrice = optionalDecimalInput(line.unitPriceTaxIncluded, '采购商品含税单价必须为有效金额');
+    return quantity && unitPrice ? quantity.mul(unitPrice).toString() : '0';
+}
+function purchaseLineMetricAmount(line) {
+    const lineAmount = optionalDecimalInput(line.lineAmountTaxIncluded, '采购商品含税金额必须为有效金额') ?? new Decimal(0);
+    if (lineAmount.gt(0))
+        return lineAmount;
+    const quantity = optionalDecimalInput(line.quantity, '采购商品数量必须为有效数值');
+    const unitPrice = optionalDecimalInput(line.unitPriceTaxIncluded, '采购商品含税单价必须为有效金额');
+    return quantity && unitPrice ? quantity.mul(unitPrice) : lineAmount;
+}
 function validateOptionalTaxRate(value, field, label, context) {
     if (!hasQueryValue(value))
         return null;
@@ -3930,6 +4422,133 @@ function reviewCandidate(documentType, block, payload) {
         warnings: block.reasons
     };
 }
+function mergeReviewPayload(base, patch) {
+    const merged = { ...base };
+    for (const [key, value] of Object.entries(patch ?? {})) {
+        if (value === null)
+            delete merged[key];
+        else
+            merged[key] = value;
+    }
+    return merged;
+}
+function restorePendingReviewBlock(block) {
+    block.status = 'PENDING';
+    block.leaseToken = null;
+    block.leaseExpiresAt = null;
+    block.resolvedAt = null;
+    block.resolutionFingerprint = null;
+}
+function catalogReviewRetryMatches(blocks, items) {
+    if (blocks.length !== items.length)
+        return false;
+    return items.every(item => {
+        const block = blocks.find(value => value.id === item.blockId);
+        if (!block || block.status !== (item.decision === 'ACCEPT' ? 'RESOLVED' : 'REJECTED'))
+            return false;
+        if (!block.resolutionFingerprint)
+            return false;
+        try {
+            return block.resolutionFingerprint === catalogReviewResolutionFingerprint(item);
+        }
+        catch {
+            return false;
+        }
+    });
+}
+function catalogReviewResolutionFingerprint(item) {
+    const resolution = item.decision === 'REJECT'
+        ? { decision: item.decision }
+        : Object.prototype.hasOwnProperty.call(item, 'payload')
+            ? { decision: item.decision, payload: item.payload, payloadPresent: true }
+            : { decision: item.decision, payloadPresent: false };
+    return createHash('sha256').update(canonicalJson(resolution)).digest('hex');
+}
+function canonicalJson(value) {
+    if (value === null || typeof value === 'string' || typeof value === 'boolean')
+        return JSON.stringify(value);
+    if (typeof value === 'number') {
+        if (!Number.isFinite(value))
+            throw new TypeError('Resolution payload is not JSON serializable');
+        return JSON.stringify(value);
+    }
+    if (Array.isArray(value))
+        return `[${value.map(item => item === undefined ? 'null' : canonicalJson(item)).join(',')}]`;
+    if (value && typeof value === 'object') {
+        const entries = Object.entries(value)
+            .filter(([, item]) => item !== undefined)
+            .sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
+        return `{${entries.map(([key, item]) => `${JSON.stringify(key)}:${canonicalJson(item)}`).join(',')}}`;
+    }
+    throw new TypeError('Resolution payload is not JSON serializable');
+}
+function evaluateCatalogReviewAccept(documentType, block, patch) {
+    try {
+        const payload = mergeReviewPayload(block.payload, patch);
+        let candidate = reviewCandidate(documentType, block, payload);
+        if (!validCatalogReviewCandidateValues(candidate))
+            return { candidate: null, reasons: ['REVIEW_PAYLOAD_INVALID'] };
+        candidate = normalizeCatalogCandidate(candidate);
+        const decision = classifyCandidate(candidate);
+        if (decision.confidence === 'LOW')
+            return { candidate: null, reasons: decision.reasons };
+        if (candidate.kind === 'SANCTION' && typeof candidate.values.effectiveDate === 'string' && !isRealIsoDate(candidate.values.effectiveDate)) {
+            return { candidate: null, reasons: ['EFFECTIVE_DATE_INVALID'] };
+        }
+        return { candidate, reasons: [] };
+    }
+    catch {
+        return { candidate: null, reasons: ['REVIEW_PAYLOAD_INVALID'] };
+    }
+}
+const CATALOG_REVIEW_VARCHAR_MAX = 255;
+const CATALOG_REVIEW_TEXT_MAX = 100_000;
+const CATALOG_REVIEW_ARRAY_MAX = 100;
+function validCatalogReviewCandidateValues(candidate) {
+    const values = candidate.values;
+    const varcharFields = candidate.kind === 'CONTROLLED'
+        ? ['productName', 'hsCode', 'controlCode', 'sourceSection', 'sourceOrdinal']
+        : ['companyName', 'countryOrRegion', 'sanctionListSource', 'effectiveDate'];
+    const textFields = candidate.kind === 'CONTROLLED'
+        ? ['originalProductName', 'controlDescription', 'originalControlDescription']
+        : ['sanctionReason', 'remarks'];
+    if (!validOptionalStrings(values, varcharFields, CATALOG_REVIEW_VARCHAR_MAX))
+        return false;
+    if (!validOptionalStrings(values, textFields, CATALOG_REVIEW_TEXT_MAX))
+        return false;
+    if (values.translationRequired !== undefined && typeof values.translationRequired !== 'boolean')
+        return false;
+    if (values.translationSource !== undefined && values.translationSource !== 'SOURCE_CHINESE' && values.translationSource !== 'AGENT_TRANSLATED')
+        return false;
+    if (values.hsCodes !== undefined && (!Array.isArray(values.hsCodes) || values.hsCodes.length > CATALOG_REVIEW_ARRAY_MAX ||
+        values.hsCodes.some(value => typeof value !== 'string' || value.length > CATALOG_REVIEW_VARCHAR_MAX)))
+        return false;
+    if (values.aliases !== undefined && (!Array.isArray(values.aliases) || values.aliases.length > CATALOG_REVIEW_ARRAY_MAX ||
+        values.aliases.some(value => !validCatalogReviewAlias(value))))
+        return false;
+    return true;
+}
+function validOptionalStrings(values, fields, maxLength) {
+    return fields.every(field => values[field] === undefined || (typeof values[field] === 'string' && values[field].length <= maxLength));
+}
+function validCatalogReviewAlias(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const alias = value.alias;
+    const aliasType = value.aliasType;
+    return typeof alias === 'string' && alias.length > 0 && alias.length <= CATALOG_REVIEW_VARCHAR_MAX &&
+        (aliasType === 'AKA' || aliasType === 'LOCAL_LANGUAGE');
+}
+function isRealIsoDate(value) {
+    const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+    if (!match)
+        return false;
+    const year = Number(match[1]);
+    const month = Number(match[2]);
+    const day = Number(match[3]);
+    const date = new Date(Date.UTC(year, month - 1, day));
+    return date.getUTCFullYear() === year && date.getUTCMonth() === month - 1 && date.getUTCDate() === day;
+}
 function appendMapValue(map, key, value) {
     const values = map.get(key);
     if (values) {
@@ -3954,7 +4573,6 @@ function assertCompleteClauseAnalyses(analyses) {
         throw new DomainError(DomainErrorCodes.INVALID_INPUT, '重新分析结果必须完整包含七类关键条款');
 }
 function decimalSum(rows, read) { return rows.reduce((value, row) => value.plus(read(row)), new Decimal(0)).toNumber(); }
-function fuzzyMatches(value, filter) { return !filter || String(value ?? '').trim().toLocaleLowerCase().includes(filter.trim().toLocaleLowerCase()); }
 function shanghaiCurrentYear(now = new Date()) {
     return Number(new Intl.DateTimeFormat('en-US', { timeZone: 'Asia/Shanghai', year: 'numeric' }).format(now));
 }