@chenchaolong/plugin-trade-compliance-workbench 1.0.91 → 1.0.93

package/dist/lib/workbench.service.js

@@ -88,6 +88,15 @@ function controlledGoodsDto(item) {
     delete dto.sourceContent;
     return dto;
 }
+function duplicateTargetFromRecord(record) {
+    const name = record.productName?.trim() || record.companyName?.trim() || '历史记录';
+    const sequence = typeof record.sourceSequence === 'number' ? `第 ${record.sourceSequence} 条` : '历史记录';
+    return [name, sequence, record.sourceLocation].filter(Boolean).join(' · ');
+}
+function normalizedIssuePayload(row) {
+    const { duplicateTargetName: _duplicateTargetName, duplicateTargetSourceSequence: _duplicateTargetSourceSequence, duplicateTargetSourceLocation: _duplicateTargetSourceLocation, ...payload } = row;
+    return payload;
+}
 function sanctionedCompanyDto(item) {
     const dto = { ...item };
     delete dto.sourceContent;
@@ -174,9 +183,6 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                     cancellationTarget: null
                 };
             }
-            if (!DELETABLE_IMPORT_TASK_STATUSES.includes(task.status)) {
-                throw new DomainError(DomainErrorCodes.INVALID_INPUT, '已完成任务不允许删除');
-            }
             const cancellationTarget = {
                 importTaskId: task.id,
                 claimAttemptToken: task.claimAttemptToken
@@ -547,7 +553,11 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 changed = true;
                 batch.invalidCount += 1;
                 batch.totalCount += 1;
-                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 }));
+                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: [
@@ -561,7 +571,13 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             batch.totalCount += 1;
             if (duplicate) {
                 batch.duplicateCount += 1;
-                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: '目录中已存在相同商品名称和海关编码' }));
+                const duplicateTarget = duplicateTargetFromRecord(duplicate);
+                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, duplicateTargetName: duplicateTarget },
+                    message: '目录中已存在相同商品名称和海关编码'
+                }));
                 continue;
             }
             await recordRepo.save(recordRepo.create({ ...auditScope(scope), batchId: batch.id, lifecycleStatus: batch.lifecycleStatus, reviewStatus: 'PENDING', 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 }));
@@ -571,8 +587,14 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return changed;
     }
     async catalogIssueExists(repository, scope, batchId, issueType, row) {
+        const payload = normalizedIssuePayload(row);
+        const find = repository.find?.bind(repository);
+        if (find) {
+            const issues = await find({ where: { ...activeScope(scope), batchId, issueType } });
+            return issues.some(issue => canonicalJson(normalizedIssuePayload((issue.parsedPayload ?? {}))) === canonicalJson(payload));
+        }
         const where = {
-            ...activeScope(scope), batchId, issueType, parsedPayload: row
+            ...activeScope(scope), batchId, issueType, parsedPayload: payload
         };
         return Boolean(await repository.findOne({ where }));
     }
@@ -1769,12 +1791,13 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 continue;
             batch.successCount = Math.max(0, batch.successCount - 1);
             batch.duplicateCount += 1;
+            const duplicateTarget = duplicateTargetFromRecord(conflict);
             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
+                    catalogType: record.catalogType, productName: record.productName, hsCode: record.hsCode, duplicateTargetName: duplicateTarget
                 },
                 message: '发布前检测到相同商品名称和海关编码的活动记录'
             }));
@@ -1803,12 +1826,13 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 continue;
             batch.successCount = Math.max(0, batch.successCount - 1);
             batch.duplicateCount += 1;
+            const duplicateTarget = duplicateTargetFromRecord(conflict);
             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
+                    companyName: record.companyName, sanctionListSource: record.sanctionListSource, duplicateTargetName: duplicateTarget
                 },
                 message: '发布前检测到相同公司和名单来源的活动记录'
             }));