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

Merge branch '20260519-3.9.2版本-葛昊天分支'

Browse Source
This commit is contained in:
geht
2026-05-26 11:09:41 +08:00
parent 589961397c e6241c16c7
commit 7786369a63
76 changed files with 10613 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-boot/jeecg-module-system/jeecg-system-biz/docs/代码修改日志
View File

@@ -418,6 +418,14 @@ jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecor
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/MesXslEquipInspectRecordList.vue
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordModal.vue
jeecgboot-vue3/src/views/xslmes/mesXslEquipInspectRecord/components/MesXslEquipInspectRecordHandleModal.vue
-- author:cursor---date:20260522--for: 【XSLMES-20260522-A31】分类字典原辅材料子类增加胶料标记字段 ---
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_99__sys_category_is_rubber.sql
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
jeecgboot-vue3/src/views/system/category/category.constants.ts
jeecgboot-vue3/src/views/system/category/category.data.ts
jeecgboot-vue3/src/views/system/category/components/CategoryModal.vue
jeecgboot-vue3/src/views/mes/material/modules/MesMixerMaterialSysCategoryModal.vue
-- author:jiangxh---date:20260522--for: 【MES】胶料快检实验类型：质量管理目录、001自动编号、CRUD与菜单权限 ---
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_97__mes_xsl_rubber_quick_test_type.sql

3
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java
View File

@@ -49,6 +49,9 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
/**是否有子节点*/
@Excel(name = "是否有子节点(1:有)", width = 15)
private java.lang.String hasChild;
/**是否胶料（仅原辅材料子类有效） 1是/0否*/
@Excel(name = "是否胶料", width = 15)
private java.lang.String isRubber;
/**租户ID*/
private java.lang.Integer tenantId;

38
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysCategoryServiceImpl.java
View File

@@ -29,6 +29,9 @@ import java.util.stream.Collectors;
@Service
public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCategory> implements ISysCategoryService {
/** MES 物料大类编码前缀（其直接子类为物料小类，可标记胶料） */
private static final String MATERIAL_MAJOR_CODE_PREFIX = "XSLMES_MATERIAL_";
@Override
public void addSysCategory(SysCategory sysCategory) {
String categoryPid = ISysCategoryService.ROOT_PID_VALUE;
@@ -64,6 +67,9 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
sysCategory.setCode(customCode);
}
sysCategory.setPid(categoryPid);
//update-begin---author:cursor ---date:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
normalizeIsRubber(sysCategory);
//update-end---author:cursor ---date:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
baseMapper.insert(sysCategory);
}
@@ -91,9 +97,41 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
}
sysCategory.setCode(newCode);
}
//update-begin---author:cursor ---date:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
normalizeIsRubber(sysCategory);
//update-end---author:cursor ---date:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
baseMapper.updateById(sysCategory);
}
//update-begin---author:cursor ---date:20260525 for：【XSLMES-20260525-A50】MES物料小类均可维护是否胶料-----------
/**
* 胶料标记仅对 MES 物料小类（父节点为物料大类）生效，其余节点强制为 0。
*/
private void normalizeIsRubber(SysCategory sysCategory) {
if (sysCategory == null) {
return;
}
if (!"1".equals(sysCategory.getIsRubber())) {
sysCategory.setIsRubber("0");
return;
}
if (!isMaterialMinorCategory(sysCategory)) {
sysCategory.setIsRubber("0");
}
}
private boolean isMaterialMinorCategory(SysCategory category) {
if (category == null || oConvertUtils.isEmpty(category.getPid())) {
return false;
}
SysCategory parent = baseMapper.selectById(category.getPid());
if (parent == null || oConvertUtils.isEmpty(parent.getCode())) {
return false;
}
return parent.getCode().startsWith(MATERIAL_MAJOR_CODE_PREFIX);
}
//update-end---author:cursor ---date:20260525 for：【XSLMES-20260525-A50】MES物料小类均可维护是否胶料-----------
@Override
public List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException{
String pid = ROOT_PID_VALUE;