From 102a274482e2bc6273e422aec5bfb3fbe619c5c9 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 6 Jun 2025 11:21:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20mes=E7=89=A9=E6=96=99BOM=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=E9=87=87=E7=94=A8del=5Fflag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/mes/domain/ProdMaterialBom.java | 5 ----- .../java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java | 4 ++-- .../mes/service/impl/ProdMaterialBomServiceImpl.java | 7 ------- .../main/resources/mapper/mes/ProdMaterialBomMapper.xml | 7 +++++-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java index 9882abf..625375f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java @@ -119,11 +119,6 @@ public class ProdMaterialBom extends TenantEntity { */ private String activeFlag; - /** - * 删除标识（1是 0否） - */ - private String deleteFlag; - /** * 备注 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java index a509767..4529e03 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java @@ -120,9 +120,9 @@ public class ProdMaterialBomBo extends BaseEntity { private String activeFlag; /** - * 删除标识（1是 0否） + * 删除标志（0代表存在 2代表删除） */ - private String deleteFlag; + private String delFlag; /** * 备注 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java index 5277c84..8ef6288 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java @@ -1,7 +1,6 @@ package org.dromara.mes.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.constant.DatabaseConstants; import org.dromara.common.constant.HwMomMesConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -11,7 +10,6 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.properties.MesProperties; import org.dromara.mes.domain.ProdPlanInfo; import org.dromara.mes.domain.bo.ProdPlanInfoBo; -import org.dromara.mes.domain.vo.ProdPlanInfoVo; import org.dromara.mes.domain.vo.TreeSelect; import org.dromara.mes.mapper.ProdPlanInfoMapper; import org.jetbrains.annotations.NotNull; @@ -70,7 +68,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { */ @Override public List queryList(ProdMaterialBomBo bo) { - bo.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_NO); MPJLambdaWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } @@ -87,7 +84,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { .like(StringUtils.isNotBlank(bo.getMaterialBomVersion()), ProdMaterialBom::getMaterialBomVersion, bo.getMaterialBomVersion()) .eq(bo.getStandardAmount() != null, ProdMaterialBom::getStandardAmount, bo.getStandardAmount()) .eq(bo.getTopFlag() != null, ProdMaterialBom::getTopFlag, bo.getTopFlag()) - .eq(bo.getDeleteFlag() != null, ProdMaterialBom::getDeleteFlag, bo.getDeleteFlag()) .eq(StringUtils.isNotBlank(bo.getCheckType()), ProdMaterialBom::getCheckType, bo.getCheckType()) .eq(bo.getProjectId() != null, ProdMaterialBom::getProjectId, bo.getProjectId()) .eq(bo.getAssembleTime() != null, ProdMaterialBom::getAssembleTime, bo.getAssembleTime()) @@ -144,7 +140,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { @Transactional(rollbackFor = Exception.class) public Boolean publishByBo(ProdMaterialBomBo bo) { String materialBomVersion = bo.getMaterialBomVersion(); - bo.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_NO); bo.setMaterialBomVersion(null); //先获取parentid所有的物料bom信息 @@ -223,7 +218,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { materialBomBos.forEach(materialBomBo -> { validEntityUsed(materialBomBo); ProdMaterialBom update = MapstructUtils.convert(materialBomBo, ProdMaterialBom.class); - update.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_YES); baseMapper.updateById(update); }); @@ -850,7 +844,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { */ @Override public List queryList4Select(ProdMaterialBomBo bo) { - bo.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_NO); MPJLambdaWrapper lqw = buildQueryWrapper(bo); List prodMaterialBomVos = baseMapper.selectVoList(lqw); diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml index ea467c7..deb859b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_material_type bmt on bmi.material_type_id = bmt.matrial_type_id left join base_material_type bmtp on pmb.parent_material_type_id = bmtp.matrial_type_id + pmb.del_flag='0' and bmt.matrial_type_code like concat('%', #{materialTypeCode}, '%') @@ -118,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join prod_material_bom pmb on pmb.parent_id=bmi.material_id and pmb.material_bom_version = #{materialBomVersion} and pmb.delete_flag='0' left join base_material_type bmt on bmi.material_type_id = bmt.matrial_type_id + pmb.del_flag='0' and bmi.material_id = #{parentId} order by bmi.material_id desc @@ -139,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_material_info bmi on pmb.parent_id=bmi.material_id left join base_material_type bmt on bmi.parent_material_type_id = bmt.matrial_type_id - and pmb.delete_flag='0' + pmb.del_flag='0' and pmb.top_flag = #{topFlag} @@ -164,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_material_info bmi on pmb.material_id=bmi.material_id left join base_material_type bmt on bsb.material_type_id = bmt.matrial_type_id + pmb.del_flag='0' and bmt.matrial_type_code like concat('%', #{materialTypeCode}, '%') @@ -182,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"