chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化种类生成逻辑

Browse Source
This commit is contained in:
geht
2026-05-25 20:42:13 +08:00
parent 441c19e87a
commit 72aeee0f10
8 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/MesXslMixingSpec.data.ts
View File

@@ -1040,12 +1040,12 @@ function matchKindFromLookup(lookup: MixerMaterialKindLookup | null | undefined,
return '';
}
/** 解析混炼示方明细种类：称量方式优先，其次物料小类 ID，最后小类名称兜底 */
/** 解析混炼示方明细种类：称量方式优先，其次物料小类 ID（未命中返回空，由配置表维护） */
export function resolveMixingMaterialKindFromLookup(
lookup: MixerMaterialKindLookup | null | undefined,
weighMode?: string,
minorCategoryId?: string,
minorCategoryName?: string,
_minorCategoryName?: string,
) {
const fromWeighMode = matchKindFromLookup(lookup, weighMode);
if (fromWeighMode) {
@@ -1055,9 +1055,6 @@ export function resolveMixingMaterialKindFromLookup(
if (fromMinorId) {
return fromMinorId;
}
if (minorCategoryName != null && String(minorCategoryName).trim() !== '') {
return String(minorCategoryName).trim();
}
return '';
}
@@ -1107,6 +1104,8 @@ export function applyMixingMaterialFromSelection(row: Recordable, material: Reco
row.mixerMaterialDesc = material.materialDesc || material.materialName || material.materialCode || '';
row.materialMajor = material.majorCategoryId_dictText || '';
row.materialMinor = material.minorCategoryId_dictText || '';
row.materialKind = materialKind || row.materialMinor || '';
//update-begin---author:cursor ---date:20260525 for：【XSLMES-20260525-A53】种类仅读配置表，移除小类名兜底-----------
row.materialKind = materialKind != null && String(materialKind).trim() !== '' ? String(materialKind).trim() : '';
//update-end---author:cursor ---date:20260525 for：【XSLMES-20260525-A53】种类仅读配置表，移除小类名兜底-----------
}
//update-end---author:cursor ---date:20260525 for：【XSLMES-20260525-A50】混炼示方密炼物料选料弹窗与种类解析-----------