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

9
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/doc/代码修改日志
View File

@@ -306,3 +306,12 @@ jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingMaterial
-- author:cursor---date:20260525--for: 【XSLMES-20260525-A52】高层级弹窗内 Message 提示层级修复 -----------
jeecgboot-vue3/src/design/public.less
-- author:cursor---date:20260525--for: 【XSLMES-20260525-A53】种类解析移除小类名兜底/通用选料弹窗接配置/配置变更清缓存 -----------
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerMaterialKindCfgService.java
jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerMaterialKindCfgServiceImpl.java
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSelectModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/MesXslMixingSpec.data.ts
jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingSpecModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslMixingSpec/components/MesXslMixingMaterialSelectModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslMixerMaterialKindCfg/MesXslMixerMaterialKindCfgList.vue

2
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/IMesXslMixerMaterialKindCfgService.java
View File

@@ -32,7 +32,7 @@ public interface IMesXslMixerMaterialKindCfgService extends IService<MesXslMixer
MesXslMixerMaterialKindLookupVO loadKindLookup(Integer tenantId);
/**
* 解析混炼示方明细种类：称量方式优先，其次物料小类，最后小类名称兜底
* 解析混炼示方明细种类：称量方式优先，其次物料小类 ID；未命中配置返回 null
*/
String resolveMixingMaterialKind(
MesXslMixerMaterialKindLookupVO lookup,

5
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/service/impl/MesXslMixerMaterialKindCfgServiceImpl.java
View File

@@ -369,10 +369,9 @@ public class MesXslMixerMaterialKindCfgServiceImpl
return fromMinor;
}
}
if (oConvertUtils.isNotEmpty(minorCategoryName)) {
return minorCategoryName.trim();
}
//update-begin---author:cursor ---date:20260525 for：【XSLMES-20260525-A53】种类未命中配置时不回退小类名-----------
return null;
//update-end---author:cursor ---date:20260525 for：【XSLMES-20260525-A53】种类未命中配置时不回退小类名-----------
}
private String matchKindFromLookup(MesXslMixerMaterialKindLookupVO lookup, String key) {