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-22 19:43:41 +08:00
parent f3e3a99ebc
commit c85657d199
30 changed files with 1786 additions and 61 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,3 +418,11 @@ 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

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;

32
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 {
/** 原辅材料分类编码（其子类可标记为胶料） */
private static final String MATERIAL_RAW_AUX_CODE = "XSLMES_MATERIAL_RAW_AUX";
@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,35 @@ 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:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
/**
* 胶料标记仅对「原辅材料」直接子类生效，其余节点强制为 0。
*/
private void normalizeIsRubber(SysCategory sysCategory) {
if (sysCategory == null) {
return;
}
if (!"1".equals(sysCategory.getIsRubber())) {
sysCategory.setIsRubber("0");
return;
}
if (oConvertUtils.isEmpty(sysCategory.getPid()) || ISysCategoryService.ROOT_PID_VALUE.equals(sysCategory.getPid())) {
sysCategory.setIsRubber("0");
return;
}
SysCategory parent = baseMapper.selectById(sysCategory.getPid());
if (parent == null || !MATERIAL_RAW_AUX_CODE.equals(parent.getCode())) {
sysCategory.setIsRubber("0");
}
}
//update-end---author:cursor ---date:20260522 for：【XSLMES-20260522-A31】原辅材料子类胶料标记归一化-----------
@Override
public List<TreeSelectModel> queryListByCode(String pcode) throws JeecgBootException{
String pid = ROOT_PID_VALUE;

3
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_100__mes_xsl_mixing_spec_stage_count_total.sql Normal file
View File

@@ -0,0 +1,3 @@
-- 段数存「当前段/总段数」文本，如 2/3（不新增字段）
ALTER TABLE `mes_xsl_mixing_spec`
MODIFY COLUMN `stage_count` varchar(20) DEFAULT NULL COMMENT '段数(当前/总)';

4
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_101__mes_xsl_mixing_spec_stage_count_revert_total.sql Normal file
View File

@@ -0,0 +1,4 @@
-- 回退误加的 stage_count_total，并确保 stage_count 为 varchar
ALTER TABLE `mes_xsl_mixing_spec` DROP COLUMN IF EXISTS `stage_count_total`;
ALTER TABLE `mes_xsl_mixing_spec`
MODIFY COLUMN `stage_count` varchar(20) DEFAULT NULL COMMENT '段数(当前/总)';

20
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_99__sys_category_is_rubber.sql Normal file
View File

@@ -0,0 +1,20 @@
-- 分类字典：原辅材料子类增加「胶料」标记字段（幂等）
SET NAMES utf8mb4;
SET @db = DATABASE();
SET @sql = IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'sys_category' AND COLUMN_NAME = 'is_rubber') = 0,
'ALTER TABLE `sys_category` ADD COLUMN `is_rubber` varchar(1) DEFAULT ''0'' COMMENT ''是否胶料 1是/0否'' AFTER `has_child`',
'SELECT 1'
);
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-- 天然胶、合成胶、再生胶默认标记为胶料
UPDATE `sys_category`
SET `is_rubber` = '1', `update_by` = 'admin', `update_time` = NOW()
WHERE `code` IN (
'XSLMES_MATERIAL_RAW_AUX_TRJ',
'XSLMES_MATERIAL_RAW_AUX_HCJ',
'XSLMES_MATERIAL_RAW_AUX_ZSJ'
);