From 2d46cf13c5c824916a3e1d20dd62b945ca5e20dd Mon Sep 17 00:00:00 2001 From: xs Date: Tue, 25 Mar 2025 15:57:09 +0800 Subject: [PATCH] =?UTF-8?q?1.3.0=EF=BC=9A=20=E7=BB=93=E6=9E=84bom=E5=92=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99bom=E5=90=8E=E7=AB=AF=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/HwMomMesConstants.java | 2 + .../common/properties/MesProperties.java | 32 ++++ .../org/dromara/mes/HwMomMesApplication.java | 3 + .../controller/ProdMaterialBomController.java | 22 ++- .../dromara/mes/domain/BaseStructureBom.java | 5 + .../dromara/mes/domain/ProdMaterialBom.java | 5 + .../mes/domain/ProdMaterialBomVersion.java | 4 + .../mes/domain/bo/BaseStructureBomBo.java | 5 + .../mes/domain/bo/ProdMaterialBomBo.java | 5 + .../domain/bo/ProdMaterialBomVersionBo.java | 4 + .../mes/domain/vo/BaseStructureBomVo.java | 2 + .../domain/vo/ProdMaterialBomVersionVo.java | 4 + .../mes/domain/vo/ProdMaterialBomVo.java | 22 +++ .../mes/mapper/BaseStructureBomMapper.java | 3 + .../mes/service/IProdMaterialBomService.java | 7 + .../impl/BaseStructureBomServiceImpl.java | 92 ++++++---- .../impl/ProdMaterialBomServiceImpl.java | 162 +++++++++++++++--- .../mapper/mes/BaseStructureBomMapper.xml | 33 +++- .../mapper/mes/ProdMaterialBomMapper.xml | 7 +- 19 files changed, 353 insertions(+), 66 deletions(-) create mode 100644 ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/properties/MesProperties.java diff --git a/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/constant/HwMomMesConstants.java b/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/constant/HwMomMesConstants.java index cd917fa8..9ba9a25e 100644 --- a/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/constant/HwMomMesConstants.java +++ b/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/constant/HwMomMesConstants.java @@ -13,5 +13,7 @@ public interface HwMomMesConstants { public static final Long MES_MATERIAL_BOM_TOP_FLAG_YES = 1L; + public static final String DELETE_FLAG_YES = "1"; + public static final String DELETE_FLAG_NO = "0"; } diff --git a/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/properties/MesProperties.java b/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/properties/MesProperties.java new file mode 100644 index 00000000..bdee44f0 --- /dev/null +++ b/ruoyi-common/hwmom-common-mom/src/main/java/org/dromara/common/properties/MesProperties.java @@ -0,0 +1,32 @@ +package org.dromara.common.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * @description mes相关配置 + * @author xins + * @date 2025/3/24 10:33 + */ +@Data +@Configuration +@ConfigurationProperties(prefix = "mes.workshop") +public class MesProperties { + + /** + * 半制品车间ID + */ + private Long semiFinishedId; + + /** + * 成型车间ID + */ + private Long modelingId; + + /** + * 硫化车间ID + */ + private Long vulcanizingId; + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/HwMomMesApplication.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/HwMomMesApplication.java index 443c94cf..7fe33dfc 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/HwMomMesApplication.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/HwMomMesApplication.java @@ -1,9 +1,11 @@ package org.dromara.mes; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.dromara.common.properties.MesProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.boot.context.properties.EnableConfigurationProperties; /** * 系统模块 @@ -12,6 +14,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt */ @EnableDubbo @SpringBootApplication +@EnableConfigurationProperties(MesProperties.class) public class HwMomMesApplication { public static void main(String[] args) { SpringApplication application = new SpringApplication(HwMomMesApplication.class); diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java index d63bad42..fd87905f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java @@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.mes.domain.BaseMeasurementUnitInfo; +import org.dromara.mes.domain.ProdMaterialBom; import org.dromara.mes.domain.ProdMaterialBomVersion; import org.dromara.mes.domain.bo.*; import org.dromara.mes.domain.vo.*; @@ -104,14 +105,27 @@ public class ProdMaterialBomController extends BaseController { * * @param materialBomIds 主键串 */ +// @SaCheckPermission("mes:materialBom:remove") +// @Log(title = "物料BOM信息", businessType = BusinessType.DELETE) +// @DeleteMapping("/{materialBomIds}") +// public R remove(@NotEmpty(message = "主键不能为空") +// @PathVariable Long[] materialBomIds) { +// return toAjax(prodMaterialBomService.deleteWithValidByIds(List.of(materialBomIds), true)); +// } + + /** + * 删除物料BOM信息 + * + * @param boList + */ @SaCheckPermission("mes:materialBom:remove") @Log(title = "物料BOM信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{materialBomIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] materialBomIds) { - return toAjax(prodMaterialBomService.deleteWithValidByIds(List.of(materialBomIds), true)); + @PostMapping("/deleteMaterialBoms") + public R remove(@RequestBody List boList) { + return toAjax(prodMaterialBomService.deleteMaterialBoms(boList)); } + /** * 下拉框查询物料BOM信息列表 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java index f14942f9..932b51c2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseStructureBom.java @@ -72,6 +72,11 @@ public class BaseStructureBom extends TenantEntity { */ private String activeFlag; + /** + * 删除标识（1是 0否） + */ + private String deleteFlag; + /** * 备注 */ 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 f43bf132..01d06347 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,6 +119,11 @@ 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/ProdMaterialBomVersion.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java index fea8ecff..aefa8ec5 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBomVersion.java @@ -32,4 +32,8 @@ public class ProdMaterialBomVersion extends TenantEntity { private String activeFlag; + /** + * bom版本说明 + */ + private String bomVersionDesc; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseStructureBomBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseStructureBomBo.java index b68df526..fb7c1a4b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseStructureBomBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseStructureBomBo.java @@ -72,6 +72,11 @@ public class BaseStructureBomBo extends BaseEntity { */ 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 14ad594f..a5097679 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 @@ -119,6 +119,11 @@ public class ProdMaterialBomBo extends BaseEntity { */ private String activeFlag; + /** + * 删除标识（1是 0否） + */ + private String deleteFlag; + /** * 备注 */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomVersionBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomVersionBo.java index b4a22897..42e3baf3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomVersionBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomVersionBo.java @@ -32,5 +32,9 @@ public class ProdMaterialBomVersionBo extends BaseEntity { @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class }) private String activeFlag; + /** + * bom版本说明 + */ + private String bomVersionDesc; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseStructureBomVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseStructureBomVo.java index a6b37084..400b3d25 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseStructureBomVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseStructureBomVo.java @@ -137,4 +137,6 @@ public class BaseStructureBomVo implements Serializable { private List children = new ArrayList(); private String materialTypeCode;//join字段 + + private String parentMaterialTypeName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVersionVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVersionVo.java index 46ccb7bd..d824f9dd 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVersionVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVersionVo.java @@ -41,5 +41,9 @@ public class ProdMaterialBomVersionVo implements Serializable { @ExcelDictFormat(readConverterExp = "1=是,0=否") private String activeFlag; + /** + * bom版本说明 + */ + private String bomVersionDesc; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java index 866c4ec3..ff9cdf22 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java @@ -15,6 +15,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** @@ -191,4 +192,25 @@ public class ProdMaterialBomVo implements Serializable { private String unitName;//子物料单位 + + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + ProdMaterialBomVo that = (ProdMaterialBomVo) o; + return Objects.equals(parentId, that.parentId) && Objects.equals(materialId, that.materialId) && Objects.equals(unitId, that.unitId) && Objects.equals(parentUnitId, that.parentUnitId) && Objects.equals(parentStandardAmount, that.parentStandardAmount) && Objects.equals(materialTypeId, that.materialTypeId) && Objects.equals(parentMaterialTypeId, that.parentMaterialTypeId) && Objects.equals(materialBomVersion, that.materialBomVersion) && Objects.equals(standardAmount, that.standardAmount); + } + + @Override + public int hashCode() { + return Objects.hash(parentId, materialId, unitId, parentUnitId, parentStandardAmount, materialTypeId, parentMaterialTypeId, materialBomVersion, standardAmount); + } + + public boolean equalsToSource(ProdMaterialBom o) { + if (o == null) return false; + return Objects.equals(parentId, o.getParentId()) && Objects.equals(materialId, o.getMaterialId()) + && Objects.equals(unitId, o.getUnitId()) && Objects.equals(parentUnitId, o.getParentUnitId()) + && parentStandardAmount.compareTo(o.getParentStandardAmount())==0 && Objects.equals(materialTypeId, o.getMaterialTypeId()) + && Objects.equals(parentMaterialTypeId, o.getParentMaterialTypeId()) && Objects.equals(materialBomVersion, o.getMaterialBomVersion()) + && standardAmount.compareTo(o.getStandardAmount())==0; + } } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseStructureBomMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseStructureBomMapper.java index 21338331..01da629d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseStructureBomMapper.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/BaseStructureBomMapper.java @@ -32,4 +32,7 @@ public interface BaseStructureBomMapper extends BaseMapperPlus selectStructureBomJoinMaterialTypeList(BaseStructureBomBo baseStructureBomBo); + + List selectStructureBomRecursives(Long materialTypeId); + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java index 72f38569..80e686af 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java @@ -58,6 +58,13 @@ public interface IProdMaterialBomService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + /** + * @param materialBomBos + * @return java.lang.Boolean + * @description 校验并批量删除物料BOM信息信息 + */ + public Boolean deleteMaterialBoms(List materialBomBos); + /** * 根据结构BOM批量插入物料清单BOM。 * @param boList 需要插入的物料清单BOM列表。 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseStructureBomServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseStructureBomServiceImpl.java index a64acde5..b093c567 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseStructureBomServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseStructureBomServiceImpl.java @@ -21,6 +21,7 @@ import org.dromara.mes.domain.BaseClassTeamInfo; import org.dromara.mes.domain.ProdMaterialBom; import org.dromara.mes.domain.bo.BaseClassTeamInfoBo; import org.dromara.mes.domain.vo.BaseClassTeamInfoVo; +import org.dromara.mes.domain.vo.ProdMaterialBomVo; import org.dromara.mes.domain.vo.TreeSelect; import org.dromara.mes.mapper.ProdMaterialBomMapper; import org.springframework.stereotype.Service; @@ -31,6 +32,7 @@ import org.dromara.mes.mapper.BaseStructureBomMapper; import org.dromara.mes.service.IBaseStructureBomService; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -175,32 +177,28 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService { throw new ServiceException("此物料类型下已经有此子级物料类型"); } - //TODO:需要找整棵树，不能无限循环 - BaseStructureBom reverseQuery = new BaseStructureBom();//同一个物料类型同一个父级，反过来父级物料类型是物料类型的子级 - reverseQuery.setParentId(entity.getMaterialTypeId()); - reverseQuery.setMaterialTypeId(entity.getParentId()); - if (baseMapper.selectCount(Wrappers.lambdaQuery(reverseQuery)) > 0) { - throw new ServiceException("已经存在此物料类型的父级物料类型是此子级物料类型"); + List recursiveVos = baseMapper.selectStructureBomRecursives(entity.getParentId()); + if (recursiveVos != null && !recursiveVos.isEmpty()) { + List filterVos = recursiveVos.stream(). + filter(vo -> vo.getParentId().equals(entity.getMaterialTypeId()) || vo.getMaterialTypeId().equals(entity.getMaterialTypeId())).toList(); + if (!filterVos.isEmpty()) { + throw new ServiceException("已经存在此物料类型的父级物料类型是此子级物料类型"); + } } } /** - * 校验是否被生产bom引用，需要校验父级和子级都已经被引用，才算引用 + * 校验是否被生产bom引用，需要校验父级是否被引用，才算引用 */ - private boolean materialBomUsed(BaseStructureBomVo dbStructureBomVo){ - //需要校验父级和子级都已经被引用，才算引用 + private boolean materialBomUsed(BaseStructureBomVo dbStructureBomVo) { + //需要校验父级是否已经被引用 Long dbParentMaterialTypeId = dbStructureBomVo.getParentId(); - Long dbMaterialTypeId = dbStructureBomVo.getMaterialTypeId(); ProdMaterialBom parentQuery = new ProdMaterialBom(); - parentQuery.setMaterialTypeId(dbParentMaterialTypeId); + parentQuery.setParentMaterialTypeId(dbParentMaterialTypeId); Long parentCount = prodMaterialBomMapper.selectCount(Wrappers.lambdaQuery(parentQuery)); - ProdMaterialBom childQuery = new ProdMaterialBom(); - childQuery.setMaterialTypeId(dbMaterialTypeId); - Long childCount = prodMaterialBomMapper.selectCount(Wrappers.lambdaQuery(childQuery)); - - return (parentCount > 0 && childCount > 0) ; + return parentCount > 0; } @@ -214,16 +212,10 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService { @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { - for (Long id : ids) { - //监测删除的节点是否有子节点 - BaseStructureBom query = new BaseStructureBom(); - query.setParentId(id); -// if (baseMapper.selectCount(Wrappers.lambdaQuery(query)) > 0) { -// throw new ServiceException("BOM结构编号["+id+"]存在子节点,不允许删除"); -// } - BaseStructureBomVo dbStructureBomVo = baseMapper.selectVoById(id); + for (Long structureBomId : ids) { + BaseStructureBomVo dbStructureBomVo = baseMapper.selectVoById(structureBomId); if (materialBomUsed(dbStructureBomVo)) { - throw new ServiceException("BOM结构编号["+id+"]的物料类型和子级物料类型都已经在生产BOM中配置，不允许删除"); + throw new ServiceException("BOM结构编号[" + structureBomId + "]已经在生产BOM中配置，不允许删除"); } } @@ -255,17 +247,47 @@ public class BaseStructureBomServiceImpl implements IBaseStructureBomService { */ private List buildStructureBomTree(List structureBomVos) { List returnList = new ArrayList(); - List tempList = structureBomVos.stream().map(BaseStructureBomVo::getMaterialTypeId).collect(Collectors.toList()); - for (BaseStructureBomVo structureBomVo : structureBomVos) { -// if (structureBomVo.getMaterialTypeId().equals(-1L) && StringUtil.isBlank(structureBomVo.getMaterialTypeName())) { -// structureBomVo.setMaterialTypeName("BOM结构"); -// } - // 如果是顶级节点, 遍历该父节点的所有子节点 - if (!tempList.contains(structureBomVo.getParentId())) { - recursionFn(structureBomVos, structureBomVo); - returnList.add(structureBomVo); - } + //1、先过滤出顶级 + List topStructureBomVos = structureBomVos.stream() + .filter(obj -> structureBomVos.stream() + .noneMatch(other -> other.getMaterialTypeId().longValue() == obj.getParentId().longValue())) + .toList(); + + //2、过滤出parentId相同的 + List distinctParentIdVoList = topStructureBomVos.stream() + .collect(Collectors.toMap( + BaseStructureBomVo::getParentId, // 以parentId作为key + Function.identity(), // 以对象本身作为value + (existing, replacement) -> existing // 如果遇到重复的key，保留已有的对象 + )) + .values() + .stream() + .toList(); + + //3、基于过滤出顶级的进行递归 + for (BaseStructureBomVo baseStructureBomVo : distinctParentIdVoList) { + BaseStructureBomVo topStructureBomVo = new BaseStructureBomVo(); + topStructureBomVo.setStructureBomId(0L); + topStructureBomVo.setParentId(0L); + topStructureBomVo.setMaterialTypeId(baseStructureBomVo.getParentId()); + topStructureBomVo.setMaterialTypeName(baseStructureBomVo.getParentMaterialTypeName());//设置parent的物料类型名称 + structureBomVos.add(topStructureBomVo); + + recursionFn(structureBomVos, topStructureBomVo); + returnList.add(topStructureBomVo); } + +// List tempList = structureBomVos.stream().map(BaseStructureBomVo::getMaterialTypeId).collect(Collectors.toList()); +// for (BaseStructureBomVo structureBomVo : structureBomVos) { +//// if (structureBomVo.getMaterialTypeId().equals(-1L) && StringUtil.isBlank(structureBomVo.getMaterialTypeName())) { +//// structureBomVo.setMaterialTypeName("BOM结构"); +//// } +// // 如果是顶级节点, 遍历该父节点的所有子节点 +// if (!tempList.contains(structureBomVo.getParentId())) { +// recursionFn(structureBomVos, structureBomVo); +// returnList.add(structureBomVo); +// } +// } if (returnList.isEmpty()) { returnList = structureBomVos; } 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 fec6b84d..99257c5b 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,13 +1,21 @@ 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; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; 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; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdMaterialBomBo; import org.dromara.mes.domain.vo.ProdMaterialBomVo; @@ -36,6 +44,12 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { private final ProdMaterialBomMapper baseMapper; + private final ProdPlanInfoMapper prodPlanInfoMapper; + + @Autowired + private MesProperties mesProperties; + + /** * 查询物料BOM信息 * @@ -56,6 +70,7 @@ 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); } @@ -72,6 +87,7 @@ 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()) @@ -91,9 +107,8 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { @Override public Boolean insertByBo(ProdMaterialBomBo bo) { isTopFlag(bo); - ProdMaterialBomVo info = baseMapper.selectVoById(bo.getParentId()); ProdMaterialBom add = MapstructUtils.convert(bo, ProdMaterialBom.class); - validEntityBeforeSave(add); + validEntityUsed(bo); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setMaterialBomId(add.getMaterialBomId()); @@ -110,16 +125,14 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { @Override public Boolean updateByBo(ProdMaterialBomBo bo) { ProdMaterialBom update = MapstructUtils.convert(bo, ProdMaterialBom.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + ProdMaterialBomVo dbProdMaterialBomVo = baseMapper.selectVoById(bo.getMaterialBomId()); + if (!dbProdMaterialBomVo.equalsToSource(update)) { + validEntityUsed(bo); + return baseMapper.updateById(update) > 0; + } + return true; } - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(ProdMaterialBom entity) { - //TODO 做一些数据校验,如唯一约束 - } /** * 校验并批量删除物料BOM信息信息 @@ -143,6 +156,78 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { return baseMapper.deleteByIds(ids) > 0; } + + /** + * @param materialBomBos + * @return java.lang.Boolean + * @description 校验并批量删除物料BOM信息信息 + */ + @Override + @Transactional (rollbackFor = Exception.class) + public Boolean deleteMaterialBoms(List materialBomBos) { + Collection ids = new ArrayList<>(); + materialBomBos.forEach(materialBomBo -> { + validEntityUsed(materialBomBo); + ProdMaterialBom update = MapstructUtils.convert(materialBomBo, ProdMaterialBom.class); + update.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_YES); + baseMapper.updateById(update); + }); + + return true; + } + + + /** + * 更新前的数据校验 + */ + private void validEntityUsed(@NotNull ProdMaterialBomBo entity) { + Long semiFinishedId = mesProperties.getSemiFinishedId(); + Long modelingId = mesProperties.getModelingId(); + Long vulcanizingId = mesProperties.getVulcanizingId(); + + String semiFinishedTableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_" + semiFinishedId; + String modelingTableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_" + modelingId; + String vulcanizingTableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_" + vulcanizingId; + + ProdPlanInfoBo queryBo = new ProdPlanInfoBo(); + queryBo.setMaterialId(entity.getParentId()); + queryBo.setMaterialBomVersion(entity.getMaterialBomVersion()); + MPJLambdaWrapper lqw = buildPlanQueryWrapper(queryBo); + + /** + * 查询半制品计划、成型计划、硫化计划中有没有使用此bom + */ + List semiFinishedPlanInfoVos = prodPlanInfoMapper.selectProdPlanInfoList(semiFinishedTableName, lqw); + if (semiFinishedPlanInfoVos != null && !semiFinishedPlanInfoVos.isEmpty()) { + List planCodes = semiFinishedPlanInfoVos.stream() + .map(ProdPlanInfoVo::getPlanCode) + .toList(); + + throw new ServiceException("半制品计划中计划编号[" + planCodes.toString() + "]已经使用此bom，不能修改"); + } + + List modelingPlanInfoVos = prodPlanInfoMapper.selectProdPlanInfoList(modelingTableName, lqw); + if (modelingPlanInfoVos != null && !modelingPlanInfoVos.isEmpty()) { + List planCodes = modelingPlanInfoVos.stream() + .map(ProdPlanInfoVo::getPlanCode) + .toList(); + + throw new ServiceException("成型计划中计划编号[" + planCodes.toString() + "]已经使用此bom，不能修改"); + } + + List vulcanizingPlanInfoVos = prodPlanInfoMapper.selectProdPlanInfoList(vulcanizingTableName, lqw); + if (vulcanizingPlanInfoVos != null && !vulcanizingPlanInfoVos.isEmpty()) { + List planCodes = vulcanizingPlanInfoVos.stream() + .map(ProdPlanInfoVo::getPlanCode) + .toList(); + + throw new ServiceException("硫化计划中计划编号已经使用[" + planCodes.toString() + "已经使用此bom，不能修改"); + } + + } + + + /** * SET顶级标识 * 判断是否顶级BOM @@ -171,8 +256,8 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { if (CollUtil.isEmpty(boList)) { return false; } - //todo:在pojo中增加equals方法，来判断有没有修改，如果有修改则判断计划中是否有引用，根据物料id和bom版本找 - //TODO:判断在新建子级时，是否存在在此颗树的父级节点存在此子级节点，根据bom版本找 + + //判断在新建子级时，是否存在在此颗树的父级节点存在此子级节点，根据bom版本找(可以先不加此判断，主要原因是物料类型已经限制了) //获取materialbomid不为空的更新，获取materialbomid为空materialid不为空的保存 for (ProdMaterialBomBo prodMaterialBomBo : boList) { if (prodMaterialBomBo.getMaterialBomId() == null) { @@ -213,7 +298,7 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { */ @Override public ProdMaterialBomVo selectParentMaterialBom(ProdMaterialBomBo bo) { - return baseMapper.selectParentMaterialBomJoin(bo); + return baseMapper.selectParentMaterialBomJoin(bo); } @@ -238,15 +323,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { */ private List buildMaterialBomTree(List prodMaterialBomVos) { List returnList = new ArrayList(); -// ProdMaterialBomVo topProdMaterialBomVo = new ProdMaterialBomVo(); -// topProdMaterialBomVo.setMaterialId(0L); -// topProdMaterialBomVo.setMaterialName("生产BOM"); -// topProdMaterialBomVo.setMaterialTypeId(1L); -// prodMaterialBomVos.add(topProdMaterialBomVo); - - -// List tempList = prodMaterialBomVos.stream().map(ProdMaterialBomVo::getMaterialId).toList(); - /** * 由于顶级节点的parent没有父级对象，需要虚拟新增一个 * 例如顶级节点v1版本A节点下有b，也有c，则只增加一个A的顶级节点对象，parentId是1，materialId是A @@ -306,7 +382,6 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { } - /** * 构建前端所需要下拉树结构 * @@ -365,4 +440,45 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { return getChildList(list, t).size() > 0 ? true : false; } + + private MPJLambdaWrapper buildPlanQueryWrapper(ProdPlanInfoBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdPlanInfo.class) + .selectAll(ProdPlanInfo.class) + .eq(bo.getPlanId() != null, ProdPlanInfo::getPlanId, bo.getPlanId()) + .eq(bo.getProductOrderId() != null, ProdPlanInfo::getProductOrderId, bo.getProductOrderId()) + .eq(bo.getSaleOrderId() != null, ProdPlanInfo::getSaleOrderId, bo.getSaleOrderId()) + .eq(StringUtils.isNotBlank(bo.getSaleorderCode()), ProdPlanInfo::getSaleorderCode, bo.getSaleorderCode()) + .eq(StringUtils.isNotBlank(bo.getPlanCode()), ProdPlanInfo::getPlanCode, bo.getPlanCode()) + .eq(StringUtils.isNotBlank(bo.getDispatchCode()), ProdPlanInfo::getDispatchCode, bo.getDispatchCode()) + .eq(bo.getMaterialId() != null, ProdPlanInfo::getMaterialId, bo.getMaterialId()) + .eq(bo.getMaterialBomVersion() != null, ProdPlanInfo::getMaterialBomVersion, bo.getMaterialBomVersion()) + .eq(bo.getMaterialBomId() != null, ProdPlanInfo::getMaterialBomId, bo.getMaterialBomId()) + .eq(bo.getProcessId() != null, ProdPlanInfo::getProcessId, bo.getProcessId()) + .eq(bo.getProcessOrder() != null, ProdPlanInfo::getProcessOrder, bo.getProcessOrder()) + .eq(bo.getLastProcessId() != null, ProdPlanInfo::getLastProcessId, bo.getLastProcessId()) + .eq(StringUtils.isNotBlank(bo.getFinalProcessFlag()), ProdPlanInfo::getFinalProcessFlag, bo.getFinalProcessFlag()) + .eq(StringUtils.isNotBlank(bo.getReleaseType()), ProdPlanInfo::getReleaseType, bo.getReleaseType()) + .eq(bo.getReleaseId() != null, ProdPlanInfo::getReleaseId, bo.getReleaseId()) + .eq(bo.getProductionTime() != null, ProdPlanInfo::getProductionTime, bo.getProductionTime()) + .eq(bo.getPlanAmount() != null, ProdPlanInfo::getPlanAmount, bo.getPlanAmount()) + .eq(bo.getDispatchAmount() != null, ProdPlanInfo::getDispatchAmount, bo.getDispatchAmount()) + .eq(bo.getCompleteAmount() != null, ProdPlanInfo::getCompleteAmount, bo.getCompleteAmount()) + .eq(bo.getPlanBeginTime() != null, ProdPlanInfo::getPlanBeginTime, bo.getPlanBeginTime()) + .eq(bo.getPlanEndTime() != null, ProdPlanInfo::getPlanEndTime, bo.getPlanEndTime()) + .eq(bo.getRealBeginTime() != null, ProdPlanInfo::getRealBeginTime, bo.getRealBeginTime()) + .eq(bo.getRealEndTime() != null, ProdPlanInfo::getRealEndTime, bo.getRealEndTime()) + .eq(StringUtils.isNotBlank(bo.getAttachId()), ProdPlanInfo::getAttachId, bo.getAttachId()) + .eq(StringUtils.isNotBlank(bo.getPlanStatus()), ProdPlanInfo::getPlanStatus, bo.getPlanStatus()) + .eq(StringUtils.isNotBlank(bo.getImportFlag()), ProdPlanInfo::getImportFlag, bo.getImportFlag()) + .eq(StringUtils.isNotBlank(bo.getFinishFlag()), ProdPlanInfo::getFinishFlag, bo.getFinishFlag()) + .eq(bo.getPriority() != null, ProdPlanInfo::getPriority, bo.getPriority()) + .eq(bo.getShiftId() != null, ProdPlanInfo::getShiftId, bo.getShiftId()) + .eq(bo.getClassTeamId() != null, ProdPlanInfo::getClassTeamId, bo.getClassTeamId()) + .eq(StringUtils.isNotBlank(bo.getModelCode()), ProdPlanInfo::getModelCode, bo.getModelCode()) + .in(StringUtils.isNotNull(bo.getPlanIds()), ProdPlanInfo::getPlanId, bo.getPlanIds()) + .orderByDesc(ProdPlanInfo::getCreateTime); + return lqw; + } + } diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseStructureBomMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseStructureBomMapper.xml index e27c3a8b..5d1491f7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseStructureBomMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/BaseStructureBomMapper.xml @@ -35,9 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bsb.create_time, bsb.update_time, bmt.matrial_type_code as material_type_code, - bmt.matrial_type_name as material_type_name + bmt.matrial_type_name as material_type_name, + bmtf.matrial_type_name as parent_material_type_name from base_structure_bom bsb left join base_material_type bmt on bsb.material_type_id = bmt.matrial_type_id + left join base_material_type bmtf on bsb.parent_id = bmtf.matrial_type_id and bmt.matrial_type_code like concat('%', #{materialTypeCode}, '%') @@ -52,4 +54,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + 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 d0cd62ba..7f12ae4a 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 @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join base_material_info bmip on pmb.parent_id=bmip.material_id left join base_material_type bmtp on pmb.parent_material_type_id = bmtp.matrial_type_id + and pmb.delete_flag='0' and bmt.matrial_type_code like concat('%', #{materialTypeCode}, '%') @@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmb.parent_unit_id, bmt.matrial_type_name as parent_material_type_name from base_material_info bmi - left join prod_material_bom pmb on pmb.parent_id=bmi.material_id and pmb.material_bom_version = #{materialBomVersion} + 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 and bmi.material_id = #{parentId} @@ -76,7 +77,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' and pmb.top_flag = #{topFlag} @@ -97,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bmt.matrial_type_code as material_type_code, bmt.matrial_type_name as material_type_name from base_structure_bom bsb - left join prod_material_bom pmb on pmb.material_type_id = bsb.material_type_id and pmb.parent_id = #{parentId} and pmb.material_bom_version=#{materialBomVersion} + left join prod_material_bom pmb on pmb.material_type_id = bsb.material_type_id and pmb.parent_id = #{parentId} and pmb.material_bom_version=#{materialBomVersion} and pmb.delete_flag='0' 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