diff --git a/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookService.java b/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookService.java index 4ad1967..fdf8ed8 100644 --- a/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookService.java +++ b/backend/src/main/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookService.java @@ -184,11 +184,15 @@ public class MasterDataWorkbookService { line++; String code = text(source, columns, "code"), name = text(source, columns, "name"); if (code.isBlank() && !name.isBlank()) { code = codesByName.getOrDefault(name, "REF-" + UUID.nameUUIDFromBytes((kind + ":" + name).getBytes(java.nio.charset.StandardCharsets.UTF_8))); - if (existing.containsKey(code) && !name.equals(existing.get(code).get("name"))) throw bad("第" + line + "行自动编码与已有记录冲突,请指定编码列"); + while ((existing.containsKey(code) && !name.equals(existing.get(code).get("name"))) + || imported.containsKey(code) && !name.equals(imported.get(code).get("name"))) + code = "REF-" + UUID.randomUUID(); } if (code.isBlank() || name.isBlank() || code.length() > 100 || name.length() > 190) throw bad("第" + line + "行编码或名称为空/过长"); if (imported.containsKey(code) || !names.add(name)) throw bad("第" + line + "行编码或名称重复,未写入草稿"); - imported.put(code, new LinkedHashMap<>(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line)))); + Map item = new LinkedHashMap<>(existing.getOrDefault(code, Map.of())); + item.putAll(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line))); + imported.put(code, item); } int added = 0, updated = 0, disabled = 0; for (var row : imported.entrySet()) { if (existing.containsKey(row.getKey())) updated++; else added++; } diff --git a/backend/src/test/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookServiceTest.java b/backend/src/test/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookServiceTest.java index 0748e34..81ab9e5 100644 --- a/backend/src/test/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookServiceTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/masterdata/MasterDataWorkbookServiceTest.java @@ -42,6 +42,20 @@ class MasterDataWorkbookServiceTest { assertEquals(0,again.get("added")); assertEquals(generated,((Map)((List)((Map)definition.get("masterData")).get("products")).get(1)).get("code")); } + + @Test void automaticCodeCollisionIsResolvedAndExistingOwnershipIsPreserved() { + String reserved = "REF-" + java.util.UUID.nameUUIDFromBytes("groups:新分组".getBytes(java.nio.charset.StandardCharsets.UTF_8)); + Map definition = new LinkedHashMap<>(Map.of("masterData", Map.of("groups", List.of( + Map.of("code",reserved,"name","已有分组","enabled",true,"department","原产业部","extra","keep"))))); + var input = List.of(Map.of("名称","已有分组"),Map.of("名称","新分组")); + MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称")); + var rows=(List)((Map)definition.get("masterData")).get("groups"); + var original=(Map)rows.getFirst();var added=(Map)rows.get(1); + assertEquals(reserved,original.get("code"));assertEquals("原产业部",original.get("department"));assertEquals("keep",original.get("extra")); + assertNotEquals(reserved,added.get("code")); + MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称")); + assertEquals(2,((List)((Map)definition.get("masterData")).get("groups")).size()); + } @Test void replaceReferenceTableRetainsOmittedNamesAsDisabledAndPreservesOtherKinds() { Map definition = new LinkedHashMap<>(Map.of("masterData",Map.of("products",List.of(Map.of("code","OLD","name","旧产品","enabled",true)),"departments",List.of(Map.of("code","D","name","产业部","enabled",true))))); var result=MasterDataWorkbookService.importMaster(definition,List.of(Map.of("编码","NEW","名称","新产品")),"products","REPLACE",Map.of("code","编码","name","名称")); diff --git a/web/src/ConfigurationWorkbookActions.tsx b/web/src/ConfigurationWorkbookActions.tsx index 4080047..0f9af16 100644 --- a/web/src/ConfigurationWorkbookActions.tsx +++ b/web/src/ConfigurationWorkbookActions.tsx @@ -2,7 +2,7 @@ import { useMemo, useRef, useState } from 'react'; import { Alert, App, Button, Modal, Radio, Select, Space, Tag } from 'antd'; import { DownloadOutlined, UploadOutlined } from '@ant-design/icons'; import { QualityTable as Table } from './QualityTable'; -import { downloadConfigurationWorkbook, importConfigurationTables, readConfigurationWorkbook, type ConfigurationScope, type ConfigurationTable, type Definition, type ImportMode } from './configurationWorkbook'; +import { configurationPreviewTable, downloadConfigurationWorkbook, importConfigurationTables, readConfigurationWorkbook, type ConfigurationScope, type ConfigurationTable, type Definition, type ImportMode } from './configurationWorkbook'; export function ConfigurationWorkbookActions({value,onChange,scope,label,defaults=[],readOnly=false,validate,onPaste,whole=false,disabled=false}: { value:Definition;onChange:(value:Definition)=>void;scope:ConfigurationScope;label:string;defaults?:unknown[];readOnly?:boolean; @@ -21,7 +21,8 @@ export function ConfigurationWorkbookActions({value,onChange,scope,label,default try{if(!/\.xlsx$/i.test(file.name))throw new Error('请选择.xlsx格式的Excel文件');const loaded=await readConfigurationWorkbook(await file.arrayBuffer());setTables(loaded);setSelected(loaded[0]?.name??'');} catch(value){setError(value instanceof Error?value.message:'Excel读取失败');}finally{setBusy(false);if(input.current)input.current.value='';} }; - const table=tables?.find(table=>table.name===selected); + const selectedTable=tables?.find(table=>table.name===selected); + const table=selectedTable?configurationPreviewTable(selectedTable):undefined; const apply=()=>{if(!evaluated?.result)return;onChange(evaluated.result.definition);setOpen(false);message.success('已导入当前编辑,保存配置后生效');}; return <> @@ -30,7 +31,7 @@ export function ConfigurationWorkbookActions({value,onChange,scope,label,default okText="应用到当前编辑" okButtonProps={{disabled:busy||!evaluated?.result}} footer={(_, {OkBtn,CancelBtn})=><>{onPaste&&}}>
void choose(event.target.files?.[0])}/> setMode(event.target.value)} options={[{value:'MERGE',label:'合并更新'},{value:'REPLACE',label:'替换文件中的表'}]}/>
-

合并按编号或源条件更新;替换只影响文件包含的工作表。导入后由页面保存按钮生效。

+

名录按名称匹配,导出文件中的已有记录可直接改名;其他配置按编号或源条件更新。替换只影响文件包含的工作表。导入后由页面保存按钮生效。

{(error||evaluated?.error)&&} {evaluated?.result&& ({ ...item, value: item.value as MasterWorkbookKind, columns: [{ key: 'code', label: '编码(可选)' }, { key: 'name', label: '名称', required: true }, { key: 'enabled', label: '启用状态(可选)' }] })), + ...[{ value: 'departments', label: '产业部' }, { value: 'groups', label: '业务分组' }, { value: 'products', label: '产品' }, { value: 'projectGroups', label: '项目组' }].map(item => ({ ...item, value: item.value as MasterWorkbookKind, columns: [{ key: 'name', label: '名称', required: true }, { key: 'enabled', label: '启用状态(可选)' }] })), { value: 'categoryLookup', label: '业务分组对应', columns: [{ key: 'source', label: 'PDT代码', required: true }, { key: 'secondary', label: '销售片区', required: true }, { key: 'target', label: '业务分组', required: true }, { key: 'enabled', label: '启用状态(可选)' }] }, { value: 'projectGroupLookup', label: '项目组对应', columns: [{ key: 'source', label: '客户代码', required: true }, { key: 'secondary', label: '业务分组', required: true }, { key: 'target', label: '项目组', required: true }, { key: 'enabled', label: '启用状态(可选)' }] }, { value: 'departmentLookup', label: '产业部对应', columns: [{ key: 'source', label: '源事业部', required: true }, { key: 'target', label: '统一产业部', required: true }, { key: 'enabled', label: '启用状态(可选)' }] }, diff --git a/web/src/StructuredConfigEditors.tsx b/web/src/StructuredConfigEditors.tsx index 7bddcd2..efdd690 100644 --- a/web/src/StructuredConfigEditors.tsx +++ b/web/src/StructuredConfigEditors.tsx @@ -1,3 +1,4 @@ +import { newMasterDataCode } from './masterDataIdentity'; import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions'; import { matchRuleConflicts } from './classificationMaintenance'; import { useEffect, useMemo, useState } from 'react'; @@ -27,7 +28,7 @@ function objectValue(value: unknown): Record { return value && const SYSTEM_DEFINITION_METADATA_KEYS = new Set([ 'schemaversion', 'ruleversion', 'ruleversionid', 'engineversion', 'formulaversion', 'parserversion', 'mappingversion', 'mappingversionid', 'basemappingversionid', 'versionid', 'versionno', - 'releaseid', 'currentreleaseid', 'revisionid', 'sourcerevisionid', 'rowversion', + 'releaseid', 'currentreleaseid', 'revisionid', 'sourcerevisionid', 'rowversion', 'masterdata', ]); function isSystemDefinitionMetadataField(key: string): boolean { return SYSTEM_DEFINITION_METADATA_KEYS.has(key.replace(/[^a-z0-9]/gi, '').toLowerCase()); @@ -96,9 +97,9 @@ export function validateStructuredMappingDefinition(value: ConfigDefinition, _gr const codes = new Set(); const names = new Set(); masterRows(value, kind).forEach((row, index) => { const prefix = `${masterLabels[kind]}名录第 ${index + 1} 行`; - if (!row.code.trim() || !row.name.trim()) errors.push(`${prefix}:编码和名称必填`); - if (row.code.length > 100 || row.name.length > 190) errors.push(`${prefix}:编码最多100字、名称最多190字`); - if (codes.has(row.code)) errors.push(`${prefix}:编码“${row.code}”重复`); + if (!row.code.trim() || !row.name.trim()) errors.push(`${prefix}:记录标识缺失或名称未填写`); + if (row.code.length > 100 || row.name.length > 190) errors.push(`${prefix}:记录标识异常或名称超过190字`); + if (codes.has(row.code)) errors.push(`${prefix}:记录标识重复,请刷新后重试`); if (names.has(row.name)) errors.push(`${prefix}:名称“${row.name}”重复`); codes.add(row.code); names.add(row.name); }); @@ -138,7 +139,7 @@ function BatchImport({ open, title, columns, existing, writeTarget = '草稿', o }}>

粘贴 CSV 或从表格复制的内容,列顺序为:{columns.join('、')}。首行可含表头;启用列可填写 true/false。

setText(event.target.value)} rows={10} spellCheck={false} aria-label={`${title}批量导入内容`} placeholder={columns.join(',')} /> - {existing && setReplace(event.target.checked)}>按相同编码或源条件更新已有记录(不勾选时重复即停止导入)} + {existing && setReplace(event.target.checked)}>按相同名称或源条件更新已有记录(不勾选时重复即停止导入)} {error && } ; } @@ -289,24 +290,24 @@ export function MasterDataDefinitionEditor({ value, onChange, publishedNames, si const candidates = [...(publishedNames?.[masterKind] ?? []), ...mappingKinds.filter(item => mappingInfo[item].master === masterKind).flatMap(mappingKind => mappingRows(value, mappingKind).map(row => row.target))]; for (const name of candidates) { if (name === null || !name || names.has(name)) continue; - let code = name.slice(0, 100); let suffix = 2; while (codes.has(code)) { const tail = `-${suffix++}`; code = `${name.slice(0, 100 - tail.length)}${tail}`; } + const code = newMasterDataCode(codes); added.push({ code, name, enabled: true }); names.add(name); codes.add(code); count++; } next = setMasterRows(next, masterKind, [...existing, ...added]); } - onChange(next); message.success(count ? `已从当前配置及对应值载入 ${count} 个名称,请核对编码后保存` : '现有名称均已在名录中'); + onChange(next); message.success(count ? `已从当前配置及对应值载入 ${count} 个名称,请核对后保存` : '现有名称均已在名录中'); }; const departments = masterRows(value, 'departments'); - const columns: ColumnsType = [{ title: '编码', dataIndex: 'code', key: 'code', width: 220 }, { title: '名称', dataIndex: 'name', key: 'name', width: 300 }, ...(kind === 'groups' ? [{ title: '所属产业部', key: 'department', width: 220, render: (_: unknown, row: MasterRow) => { const department = departmentFor(row); const parent = departments.find(item => item.name === department); return department ? `${department}${parent && !parent.enabled ? '(已停用)' : ''}` : 未设置; } }] : []), { title: '状态', dataIndex: 'enabled', key: 'enabled', width: 100, render: enabled => {enabled ? '启用' : '停用'} }, ...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MasterRow) => }] : [])]; - const csvHeaders = kind === 'groups' ? ['编码', '名称', '启用', '所属产业部'] : ['编码', '名称', '启用']; + const columns: ColumnsType = [{ title: '名称', dataIndex: 'name', key: 'name', width: 300 }, ...(kind === 'groups' ? [{ title: '所属产业部', key: 'department', width: 220, render: (_: unknown, row: MasterRow) => { const department = departmentFor(row); const parent = departments.find(item => item.name === department); return department ? `${department}${parent && !parent.enabled ? '(已停用)' : ''}` : 未设置; } }] : []), { title: '状态', dataIndex: 'enabled', key: 'enabled', width: 100, render: enabled => {enabled ? '启用' : '停用'} }, ...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MasterRow) => }] : [])]; + const csvHeaders = kind === 'groups' ? ['名称', '启用', '所属产业部'] : ['名称', '启用']; const departmentValue = Form.useWatch('department', form); const selectedDepartment = typeof departmentValue === 'string' ? departmentValue : ''; const departmentOptions = departments.filter(row => row.enabled || row.name === selectedDepartment).map(row => ({ value: row.name, label: `${row.name}${row.enabled ? '' : '(已停用)'}`, disabled: !row.enabled })); if (selectedDepartment && !departmentOptions.some(option => option.value === selectedDepartment)) departmentOptions.push({ value: selectedDepartment, label: `${selectedDepartment}(未在产业部名录中)`, disabled: true }); - const visibleRows = rows.filter(row => `${row.code} ${row.name} ${kind === 'groups' ? departmentFor(row) : ''}`.toLowerCase().includes(search.toLowerCase())); + const visibleRows = rows.filter(row => `${row.name} ${kind === 'groups' ? departmentFor(row) : ''}`.toLowerCase().includes(search.toLowerCase())); return
- {!simplified &&

维护产业部、业务分组、产品及项目组的统一名录。编码与名称必须唯一。

{!simplified && }
} -
setSearch(event.target.value)} placeholder="查找名称或所属产业部" allowClear aria-label={`查找${label}`} />{rows.length} 条 · 启用 {rows.filter(row => row.enabled).length}
setImporting(true)} />{!readOnly && <>}

停用项保留在名录中;启用中的对应关系如引用停用名称,校验将指出具体位置。已有分析记录保留生成时使用的名称。

setEditing(null)} onOk={() => { void form.validateFields().then(fields => { @@ -314,26 +315,25 @@ export function MasterDataDefinitionEditor({ value, onChange, publishedNames, si const department = String(fields.department ?? '').trim(); const persistDepartment = kind === 'groups' && (!existing || Object.hasOwn(existing, 'department') || department !== (departmentAtOpen?.value ?? '') || (!!department && fields.name.trim() !== existing.name)); - const row: MasterRow = { ...existing, code: fields.code.trim(), name: fields.name.trim(), enabled: fields.enabled, ...(persistDepartment ? { department } : {}) }; - if (rows.some(item => item.code !== originalCode && (item.code === row.code || item.name === row.name))) { setError('编码或名称已存在,请编辑已有行'); return; } + const row: MasterRow = { ...existing, code: existing?.code || newMasterDataCode(rows.map(item => item.code)), name: fields.name.trim(), enabled: fields.enabled, ...(persistDepartment ? { department } : {}) }; + if (rows.some(item => item.code !== originalCode && (item.code === row.code || item.name === row.name))) { setError('名称已存在,请编辑已有行'); return; } onChange(setMasterRows(value, kind, originalCode === null ? [...rows, row] : rows.map(item => item.code === originalCode ? row : item))); setEditing(null); - }).catch(() => undefined); }}>
{kind === 'groups' && {kind === 'groups' &&