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

胶料维护规则

Browse Source
This commit is contained in:
chenx
2026-06-02 16:32:10 +08:00
parent 3586f86ea6
commit 29efd6694f
10 changed files with 242 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
jeecg-boot/db/mes-fix-rubber-category-visible.sql Normal file
View File

@@ -0,0 +1,64 @@
-- 修复：胶料分类字典（XSLMES_RUBBER）数据库有数据但页面不展示
-- 场景：开启多租户后，sys_category 的 tenant_id 与当前登录租户不一致/为空
SET NAMES utf8mb4;
-- 1) 目标租户：默认取 admin 用户租户；若为空则回退到 0
SET @target_tenant_id = (
SELECT COALESCE(tenant_id, 0)
FROM sys_user
WHERE username = 'admin'
ORDER BY create_time ASC
LIMIT 1
);
SET @target_tenant_id = IFNULL(@target_tenant_id, 0);
-- 2) 定位根分类编码
SET @rubber_code = 'XSLMES_RUBBER';
-- 若根节点不存在则补一个最小根节点（避免前端 pcode 查询直接失败）
INSERT INTO sys_category (id, pid, name, code, has_child, tenant_id, create_by, create_time, update_by, update_time)
SELECT '1994000000000000001', '0', 'MES胶料分类', @rubber_code, '1', @target_tenant_id, 'admin', NOW(), 'admin', NOW()
FROM dual
WHERE NOT EXISTS (
SELECT 1 FROM sys_category WHERE code = @rubber_code
);
SET @rubber_root_id = (
SELECT id
FROM sys_category
WHERE code = @rubber_code
ORDER BY create_time ASC
LIMIT 1
);
-- 3) 若根节点存在，统一修复租户与父子标记
UPDATE sys_category
SET tenant_id = @target_tenant_id
WHERE id = @rubber_root_id;
UPDATE sys_category
SET tenant_id = @target_tenant_id
WHERE pid = @rubber_root_id;
-- 根节点是否有子节点，按真实数据回写
UPDATE sys_category
SET has_child = CASE
WHEN EXISTS (SELECT 1 FROM (SELECT id FROM sys_category WHERE pid = @rubber_root_id LIMIT 1) t) THEN '1'
ELSE '0'
END
WHERE id = @rubber_root_id;
-- 子节点统一标记为无子（当前这批分类通常为叶子）
UPDATE sys_category
SET has_child = '0'
WHERE pid = @rubber_root_id;
-- 4) 结果检查（执行后看返回）
SELECT 'ROOT' AS level_tag, id, pid, code, name, tenant_id, has_child
FROM sys_category
WHERE id = @rubber_root_id
UNION ALL
SELECT 'CHILD' AS level_tag, id, pid, code, name, tenant_id, has_child
FROM sys_category
WHERE pid = @rubber_root_id
ORDER BY level_tag, code;

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

@@ -785,40 +785,46 @@ public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecM
}
String specCode = row.getSpecCode().trim();
boolean isFinalStage = "Q".equalsIgnoreCase(resolveMixingMaterialStep(row));
String categoryId = resolveGeneratedRubberCategoryId(formula);
String materialPhase = resolveGeneratedMaterialPhase(row);
MesMaterial sourceRubber = resolveSourceRubberMaterial(formula);
String categoryId = sourceRubber != null ? sourceRubber.getCategoryId() : null;
String rubberName = resolveRubberName(formula);
MesMaterial existing = findRubberMaterialByCodeOrName(specCode);
String generatedName = buildGeneratedRubberMaterialName(row, rubberName);
MesMaterial existing = findGeneratedRubberMaterialByCodeOrName(specCode, materialPhase);
Date now = new Date();
if (existing != null) {
copyGeneratedMaterialFieldsFromSource(existing, sourceRubber);
if (StringUtils.isNotBlank(categoryId)) {
existing.setCategoryId(categoryId);
}
if (StringUtils.isBlank(existing.getMaterialCode())) {
existing.setMaterialCode(specCode);
}
if (StringUtils.isBlank(existing.getMaterialName())) {
existing.setMaterialName(specCode);
}
existing.setMaterialName(generatedName);
if (StringUtils.isBlank(existing.getAliasName()) && StringUtils.isNotBlank(rubberName)) {
existing.setAliasName(rubberName);
}
existing.setMaterialPhase(materialPhase);
existing.setEnableFlag(existing.getEnableFlag() == null ? 1 : existing.getEnableFlag());
existing.setUpdateTime(now);
mesMaterialService.updateById(existing);
log.info(
"[混炼示方生成] 更新胶料信息 id={}, code={}, categoryId={}, isFinal={}",
"[混炼示方生成] 更新胶料信息 id={}, code={}, phase={}, categoryId={}, isFinal={}",
existing.getId(),
specCode,
materialPhase,
categoryId,
isFinalStage);
return;
}
MesMaterial material = new MesMaterial();
copyGeneratedMaterialFieldsFromSource(material, sourceRubber);
material.setMaterialCode(specCode);
material.setMaterialName(specCode);
material.setMaterialName(generatedName);
material.setAliasName(StringUtils.isNotBlank(rubberName) ? rubberName : null);
material.setCategoryId(categoryId);
material.setMaterialPhase(materialPhase);
material.setEnableFlag(1);
material.setIsSpecialRubber(0);
material.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -826,39 +832,117 @@ public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecM
material.setUpdateTime(now);
mesMaterialService.save(material);
log.info(
"[混炼示方生成] 新增胶料信息 id={}, code={}, categoryId={}, isFinal={}",
"[混炼示方生成] 新增胶料信息 id={}, code={}, phase={}, categoryId={}, isFinal={}",
material.getId(),
specCode,
materialPhase,
categoryId,
isFinalStage);
}
/** 生成的 B/F 段胶料类别：取配合示方所选「胶料代号」对应胶料(mes_material)的类别 */
private String resolveGeneratedRubberCategoryId(MesXslFormulaSpec formula) {
private void copyGeneratedMaterialFieldsFromSource(MesMaterial target, MesMaterial source) {
if (target == null || source == null) {
return;
}
target.setShortName(source.getShortName());
target.setCategoryId(source.getCategoryId());
target.setMaterialGrade(source.getMaterialGrade());
target.setPlanPrice(source.getPlanPrice());
target.setMinStock(source.getMinStock());
target.setMaxStock(source.getMaxStock());
target.setBaseUnitId(source.getBaseUnitId());
target.setStatUnitId(source.getStatUnitId());
target.setUnitConvertRate(source.getUnitConvertRate());
target.setErpCode(source.getErpCode());
target.setFinalShelfLifeDays(source.getFinalShelfLifeDays());
target.setMasterShelfLifeDays(source.getMasterShelfLifeDays());
target.setMinStandingHours(source.getMinStandingHours());
target.setStandardCode(source.getStandardCode());
target.setOriginPlace(source.getOriginPlace());
target.setSupplierId(source.getSupplierId());
target.setCustomerId(source.getCustomerId());
target.setEnableFlag(source.getEnableFlag());
target.setIsSpecialRubber(source.getIsSpecialRubber());
target.setSyncFromErpFlag(source.getSyncFromErpFlag());
target.setLastErpSyncTime(source.getLastErpSyncTime());
target.setRemark(source.getRemark());
}
private MesMaterial resolveSourceRubberMaterial(MesXslFormulaSpec formula) {
if (formula == null || StringUtils.isBlank(formula.getRubberMaterialId())) {
return null;
}
MesMaterial rubber = mesMaterialService.getById(formula.getRubberMaterialId());
return mesMaterialService.getById(formula.getRubberMaterialId());
}
/** 生成的 B/F 段胶料类别：取配合示方所选「胶料代号」对应胶料(mes_material)的类别 */
private String resolveGeneratedRubberCategoryId(MesXslFormulaSpec formula) {
MesMaterial rubber = resolveSourceRubberMaterial(formula);
return rubber != null ? rubber.getCategoryId() : null;
}
private MesMaterial findRubberMaterialByCodeOrName(String specCode) {
return findGeneratedRubberMaterialByCodeOrName(specCode, null);
}
private MesMaterial findGeneratedRubberMaterialByCodeOrName(String specCode, String materialPhase) {
if (StringUtils.isBlank(specCode)) {
return null;
}
MesMaterial byCode = mesMaterialService.getOne(
new LambdaQueryWrapper<MesMaterial>()
LambdaQueryWrapper<MesMaterial> byCodeWrapper = new LambdaQueryWrapper<MesMaterial>()
.eq(MesMaterial::getMaterialCode, specCode)
.and(w -> w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesMaterial::getDelFlag))
.last("limit 1"));
.and(w -> w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesMaterial::getDelFlag));
appendPhaseMatch(byCodeWrapper, materialPhase);
MesMaterial byCode = mesMaterialService.getOne(
byCodeWrapper.last("limit 1"));
if (byCode != null) {
return byCode;
}
return mesMaterialService.getOne(
new LambdaQueryWrapper<MesMaterial>()
LambdaQueryWrapper<MesMaterial> byNameWrapper = new LambdaQueryWrapper<MesMaterial>()
.eq(MesMaterial::getMaterialName, specCode)
.and(w -> w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesMaterial::getDelFlag))
.last("limit 1"));
.and(w -> w.eq(MesMaterial::getDelFlag, CommonConstant.DEL_FLAG_0).or().isNull(MesMaterial::getDelFlag));
appendPhaseMatch(byNameWrapper, materialPhase);
return mesMaterialService.getOne(
byNameWrapper.last("limit 1"));
}
private void appendPhaseMatch(LambdaQueryWrapper<MesMaterial> wrapper, String materialPhase) {
if (wrapper == null || StringUtils.isBlank(materialPhase)) {
return;
}
wrapper.and(w -> w.eq(MesMaterial::getMaterialPhase, materialPhase)
.or()
.isNull(MesMaterial::getMaterialPhase)
.or()
.eq(MesMaterial::getMaterialPhase, ""));
}
private String resolveGeneratedMaterialPhase(MesXslFormulaMixingGenerateRowVO row) {
if (row == null) {
return null;
}
if ("Q".equalsIgnoreCase(resolveMixingMaterialStep(row))) {
return "F";
}
if (row.getASegmentIndex() != null && row.getASegmentIndex() > 0) {
return "B" + row.getASegmentIndex();
}
if (row.getStageIndex() != null && row.getStageIndex() > 0) {
return "B" + row.getStageIndex();
}
return "B1";
}
private String buildGeneratedRubberMaterialName(MesXslFormulaMixingGenerateRowVO row, String rubberName) {
String baseName = StringUtils.defaultString(rubberName).trim();
if (StringUtils.isBlank(baseName) && row != null && StringUtils.isNotBlank(row.getSpecCode())) {
baseName = row.getSpecCode().trim();
}
String phase = resolveGeneratedMaterialPhase(row);
if (StringUtils.isBlank(phase)) {
return baseName;
}
return phase + baseName;
}
//update-end---author:cursor ---date:20260601 for：【XSLMES-20260601-A62】生成混炼示方改为同步B/F段胶至胶料信息-----------
@@ -947,9 +1031,9 @@ public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecM
if (row != null && row.getStageIndex() != null && row.getStageIndex() > 0) {
return Math.min(row.getStageIndex(), 7);
}
String specCode = row != null ? row.getSpecCode() : null;
if (StringUtils.isNotBlank(specCode)) {
Matcher matcher = Pattern.compile("(?i)B(\\d+)").matcher(specCode.trim());
String normalizedSpecCode = row == null ? "" : StringUtils.trimToEmpty(row.getSpecCode());
if (StringUtils.isNotEmpty(normalizedSpecCode)) {
Matcher matcher = Pattern.compile("(?i)B(\\d+)").matcher(normalizedSpecCode);
if (matcher.find()) {
return Math.min(Integer.parseInt(matcher.group(1)), 7);
}
@@ -965,8 +1049,8 @@ public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecM
if (row != null && StringUtils.isNotBlank(row.getStepType())) {
return row.getStepType().trim().toUpperCase();
}
String specCode = row != null ? row.getSpecCode() : null;
if (StringUtils.isNotBlank(specCode) && specCode.trim().toUpperCase().startsWith("F")) {
String normalizedSpecCode = row == null ? "" : StringUtils.trimToEmpty(row.getSpecCode()).toUpperCase();
if (StringUtils.isNotEmpty(normalizedSpecCode) && normalizedSpecCode.startsWith("F")) {
return "Q";
}
return "A";
@@ -984,7 +1068,6 @@ public class MesXslFormulaSpecServiceImpl extends ServiceImpl<MesXslFormulaSpecM
Map<String, String> categoryIdCache) {
String stepFilter = StringUtils.isNotBlank(materialStep) ? materialStep.trim().toUpperCase() : "A";
List<MesXslMixingSpecMaterial> materials = new ArrayList<>();
int sort = 0;
if ("Q".equals(stepFilter)) {
//update-begin---author:cursor ---date:20260522 for：【XSLMES-20260522-A38】F段加入最后一段B炼好胶料一条再加Q配合剂-----------
String rubberName = resolveRubberName(formula);

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

@@ -148,8 +148,7 @@ public class MesXslRawMaterialInspectRecordServiceImpl
if (lineList == null || lineList.isEmpty()) {
throw new JeecgBootException("请至少录入一条检验结果");
}
boolean allPass = true;
boolean hasAnyDetailUpdated = false;
for (MesXslRawMaterialInspectRecordLine line : lineList) {
if (StringUtils.isBlank(line.getId())) {
throw new JeecgBootException("明细ID不能为空，请刷新后重试");
@@ -158,6 +157,15 @@ public class MesXslRawMaterialInspectRecordServiceImpl
if (dbLine == null || !recordId.equals(dbLine.getRecordId())) {
throw new JeecgBootException("明细不存在或不属于当前送检记录");
}
// 已录入（非待检）明细不允许再次录入，防止重复覆盖。
String dbPassFlag = normalize(dbLine.getPassFlag());
if (!STATUS_PENDING.equals(dbPassFlag)) {
throw new JeecgBootException("检验项目【" + dbLine.getInspectItemName() + "】已录入，不能重复录入");
}
// 允许分次录入：本次未填检验值的明细跳过，不改该行状态。
if (line.getInspectValue() == null) {
continue;
}
String passFlag =
evaluatePassFlag(
line.getInspectValue(),
@@ -168,15 +176,31 @@ public class MesXslRawMaterialInspectRecordServiceImpl
dbLine.setInspectValue(line.getInspectValue());
dbLine.setPassFlag(passFlag);
recordLineMapper.updateById(dbLine);
hasAnyDetailUpdated = true;
}
if (!hasAnyDetailUpdated) {
throw new JeecgBootException("请至少录入一条检验值后再保存");
}
List<MesXslRawMaterialInspectRecordLine> allDbLines = selectLinesByRecordId(recordId);
boolean allCompleted = true;
boolean allPass = true;
for (MesXslRawMaterialInspectRecordLine dbLine : allDbLines) {
String passFlag = normalize(dbLine.getPassFlag());
if (STATUS_PENDING.equals(passFlag) || StringUtils.isBlank(passFlag)) {
allCompleted = false;
continue;
}
if (!STATUS_PASS.equals(passFlag)) {
allPass = false;
}
}
// 仅当全部明细已完成录入时，才回写主表/卡片检验状态。
if (allCompleted) {
record.setInspectStatus(allPass ? STATUS_PASS : STATUS_FAIL);
record.setResultTime(new Date());
this.updateById(record);
// 判定完成后回写原材料卡片检测结果
if (StringUtils.isNotBlank(record.getRawMaterialCardId())) {
MesXslRawMaterialCard card = new MesXslRawMaterialCard();
card.setId(record.getRawMaterialCardId());
@@ -184,6 +208,7 @@ public class MesXslRawMaterialInspectRecordServiceImpl
rawMaterialCardService.updateById(card);
}
}
}
@Override
public String evaluatePassFlag(

4
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesMaterialController.java
View File

@@ -33,8 +33,12 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
MesMaterial model,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "onlySales", required = false) Integer onlySales,
HttpServletRequest req) {
QueryWrapper<MesMaterial> queryWrapper = QueryGenerator.initQueryWrapper(model, req.getParameterMap());
if (onlySales != null && onlySales == 1) {
queryWrapper.and(w -> w.isNull("material_phase").or().eq("material_phase", ""));
}
IPage<MesMaterial> pageList = mesMaterialService.page(new Page<>(pageNo, pageSize), queryWrapper);
return Result.OK(pageList);
}

2
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesMaterial.java
View File

@@ -74,6 +74,8 @@ public class MesMaterial implements Serializable {
@Excel(name = "胶料客户", width = 15, dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
@Dict(dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
private String customerId;
@Excel(name = "物料阶段", width = 12)
private String materialPhase;
@Excel(name = "使用状态", width = 10, replace = {"使用中_1", "停用_0"})
private Integer enableFlag;
@Excel(name = "是否为特种胶", width = 12, replace = {"是_1", "否_0"})

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

@@ -0,0 +1,11 @@
-- mes_material 新增物料阶段字段（销售物料为空，生产自动生成为 Bn/F）
SET NAMES utf8mb4;
SET @db = DATABASE();
SET @sql = IF(
(SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'mes_material' AND COLUMN_NAME = 'material_phase') = 0,
'ALTER TABLE `mes_material` ADD COLUMN `material_phase` varchar(16) DEFAULT NULL COMMENT ''物料阶段（销售为空，生产为B1/B2.../F）'' AFTER `customer_id`',
'SELECT 1'
);
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;

3
jeecgboot-vue3/src/views/mes/material/modules/MesMaterialSelectModal.vue
View File

@@ -16,6 +16,7 @@
const { createMessage } = useMessage();
const selectedRow = ref<Recordable | null>(null);
const onlySales = ref(false);
const [registerTable, { reload, getSelectRowKeys, getSelectRows, setSelectedRowKeys, clearSelectedRowKeys }] = useTable({
api: materialList,
@@ -33,6 +34,7 @@
beforeFetch: (params) => ({
...params,
enableFlag: params.enableFlag ?? 1,
onlySales: onlySales.value ? 1 : undefined,
}),
rowSelection: {
type: 'radio',
@@ -46,6 +48,7 @@
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
selectedRow.value = null;
onlySales.value = !!data?.onlySales;
clearSelectedRowKeys?.();
setModalProps({ confirmLoading: false });
const materialId = data?.materialId as string | undefined;

2
jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/components/MesXslFormulaSpecModal.vue
View File

@@ -831,7 +831,7 @@
if (!showFooterFlag.value) {
return;
}
openRubberMaterialModalInner(true, { materialId: rubberMaterialPickerId.value || '' });
openRubberMaterialModalInner(true, { materialId: rubberMaterialPickerId.value || '', onlySales: true });
}
function openIssueNumberPicker() {

7
jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/MesXslRawMaterialInspectRecord.data.ts
View File

@@ -68,7 +68,12 @@ export const lineJVxeColumns: JVxeColumn[] = [
key: 'inspectValue',
type: JVxeTypes.inputNumber,
width: 120,
validateRules: [{ required: true, message: '${title}必填' }],
props: {
isDisabledCell: ({ row }) => {
const passFlag = String(row?.passFlag ?? '');
return passFlag !== '' && passFlag !== '0';
},
},
},
{
title: '判定',

13
jeecgboot-vue3/src/views/xslmes/mesXslRawMaterialInspectRecord/modules/MesXslRawMaterialInspectRecordResultModal.vue
View File

@@ -114,15 +114,14 @@
}
try {
const lineRef = lineTableRef.value as any;
if (lineRef?.validateTable) {
const err = await lineRef.validateTable();
if (err) {
createMessage.warning('请完善检验值');
const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
const editableRows = tableData.filter((item) => String(item?.passFlag ?? '0') === '0');
const hasInput = editableRows.some((item) => item.inspectValue !== null && item.inspectValue !== undefined && item.inspectValue !== '');
if (!hasInput) {
createMessage.warning('请至少录入一条检验值');
return;
}
}
const tableData = (lineRef?.getTableData?.() || []) as Recordable[];
const lineList = tableData.map((item) => ({
const lineList = editableRows.map((item) => ({
id: item.id,
inspectValue: item.inspectValue,
}));