From fe41ac0388b21d051b3acd118dafc524dc93d849 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 9 Jan 2025 10:25:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20add=E7=94=9F=E4=BA=A7BOM=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProdMaterialBomController.java | 115 +++++++++++++ .../dromara/mes/domain/ProdMaterialBom.java | 106 ++++++++++++ .../mes/domain/bo/ProdMaterialBomBo.java | 105 ++++++++++++ .../mes/domain/vo/ProdMaterialBomVo.java | 157 ++++++++++++++++++ .../mes/mapper/ProdMaterialBomMapper.java | 15 ++ .../mes/service/IProdMaterialBomService.java | 59 +++++++ .../impl/ProdMaterialBomServiceImpl.java | 129 ++++++++++++++ .../mapper/mes/ProdMaterialBomMapper.xml | 7 + 8 files changed, 693 insertions(+) create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMaterialBomMapper.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java create mode 100644 ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml 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 new file mode 100644 index 00000000..5bed053d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdMaterialBomController.java @@ -0,0 +1,115 @@ +package org.dromara.mes.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mes.domain.vo.ProdMaterialBomVo; +import org.dromara.mes.domain.bo.ProdMaterialBomBo; +import org.dromara.mes.service.IProdMaterialBomService; + +/** + * 物料BOM信息 + * 前端访问路由地址为:/mes/materialBom + * + * @author Yinq + * @date 2025-01-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/materialBom") +public class ProdMaterialBomController extends BaseController { + + private final IProdMaterialBomService prodMaterialBomService; + + /** + * 查询物料BOM信息列表 + */ + @SaCheckPermission("mes:materialBom:list") + @GetMapping("/list") + public R> list(ProdMaterialBomBo bo) { + List list = prodMaterialBomService.queryList(bo); + return R.ok(list); + } + + /** + * 导出物料BOM信息列表 + */ + @SaCheckPermission("mes:materialBom:export") + @Log(title = "物料BOM信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ProdMaterialBomBo bo, HttpServletResponse response) { + List list = prodMaterialBomService.queryList(bo); + ExcelUtil.exportExcel(list, "物料BOM信息", ProdMaterialBomVo.class, response); + } + + /** + * 获取物料BOM信息详细信息 + * + * @param materialBomId 主键 + */ + @SaCheckPermission("mes:materialBom:query") + @GetMapping("/{materialBomId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long materialBomId) { + return R.ok(prodMaterialBomService.queryById(materialBomId)); + } + + /** + * 新增物料BOM信息 + */ + @SaCheckPermission("mes:materialBom:add") + @Log(title = "物料BOM信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ProdMaterialBomBo bo) { + return toAjax(prodMaterialBomService.insertByBo(bo)); + } + + /** + * 修改物料BOM信息 + */ + @SaCheckPermission("mes:materialBom:edit") + @Log(title = "物料BOM信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ProdMaterialBomBo bo) { + return toAjax(prodMaterialBomService.updateByBo(bo)); + } + + /** + * 删除物料BOM信息 + * + * @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信息列表 + */ + @GetMapping("getProdMaterialBomList") + public R> getProdMaterialBomlist(ProdMaterialBomBo bo) { + List list = prodMaterialBomService.queryList(bo); + return R.ok(list); + } +} 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 new file mode 100644 index 00000000..b0414007 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdMaterialBom.java @@ -0,0 +1,106 @@ +package org.dromara.mes.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 物料BOM信息对象 prod_material_bom + * + * @author Yinq + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("prod_material_bom") +public class ProdMaterialBom extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + @TableId(value = "material_bom_id", type = IdType.AUTO) + private Long materialBomId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * bom说明 + */ + private String materialBomDesc; + + /** + * bom版本 + */ + private String materialBomVersion; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 标准数量 + */ + private Long standardAmount; + + /** + * 顶级标识(1是 0否) + */ + private Long topFlag; + + /** + * 校验类型(0不校验 1人工校验 2自动校验) + */ + private String checkType; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 装配时长(秒) + */ + private Long assembleTime; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + private String materialClassfication; + + /** + * 附件信息 + */ + private String attachId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..7ea4526d --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdMaterialBomBo.java @@ -0,0 +1,105 @@ +package org.dromara.mes.domain.bo; + +import org.dromara.mes.domain.ProdMaterialBom; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 物料BOM信息业务对象 prod_material_bom + * + * @author Yinq + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ProdMaterialBom.class, reverseConvertGenerate = false) +public class ProdMaterialBomBo extends BaseEntity { + + /** + * 主键标识 + */ + private Long materialBomId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 物料ID + */ + @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 物料名称 + */ + private String materialName; + + /** + * bom说明 + */ + private String materialBomDesc; + + /** + * bom版本 + */ + private String materialBomVersion; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 标准数量 + */ + private Long standardAmount; + + /** + * 顶级标识(1是 0否) + */ + private Long topFlag; + + /** + * 校验类型(0不校验 1人工校验 2自动校验) + */ + private String checkType; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 装配时长(秒) + */ + private Long assembleTime; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + private String materialClassfication; + + /** + * 附件信息 + */ + private String attachId; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 备注 + */ + private String remark; + + +} 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 new file mode 100644 index 00000000..0e6cbd36 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdMaterialBomVo.java @@ -0,0 +1,157 @@ +package org.dromara.mes.domain.vo; + +import org.dromara.mes.domain.ProdMaterialBom; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 物料BOM信息视图对象 prod_material_bom + * + * @author Yinq + * @date 2025-01-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ProdMaterialBom.class) +public class ProdMaterialBomVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long materialBomId; + + /** + * 父级标识 + */ + private Long parentId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName; + + /** + * bom说明 + */ + private String materialBomDesc; + + /** + * bom版本 + */ + private String materialBomVersion; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 标准数量 + */ + @ExcelProperty(value = "标准数量") + private Long standardAmount; + + /** + * 顶级标识(1是 0否) + */ + @ExcelProperty(value = "顶级标识(1是 0否)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private Long topFlag; + + /** + * 校验类型(0不校验 1人工校验 2自动校验) + */ + @ExcelProperty(value = "校验类型(0不校验 1人工校验 2自动校验)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "mes_check_type") + private String checkType; + + /** + * 项目ID + */ + @ExcelProperty(value = "项目ID") + private Long projectId; + + /** + * 装配时长(秒) + */ + @ExcelProperty(value = "装配时长(秒)") + private Long assembleTime; + + /** + * 物料分类（1ERP同步 2虚拟物料 3MES物料） + */ + @ExcelProperty(value = "物料分类", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "material_classfication") + private String materialClassfication; + + /** + * 附件信息 + */ + @ExcelProperty(value = "附件信息") + private String attachId; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMaterialBomMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMaterialBomMapper.java new file mode 100644 index 00000000..21432eb8 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdMaterialBomMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mes.mapper; + +import org.dromara.mes.domain.ProdMaterialBom; +import org.dromara.mes.domain.vo.ProdMaterialBomVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 物料BOM信息Mapper接口 + * + * @author Yinq + * @date 2025-01-08 + */ +public interface ProdMaterialBomMapper extends BaseMapperPlus { + +} 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 new file mode 100644 index 00000000..206eab7b --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java @@ -0,0 +1,59 @@ +package org.dromara.mes.service; + +import org.dromara.mes.domain.ProdMaterialBom; +import org.dromara.mes.domain.vo.ProdMaterialBomVo; +import org.dromara.mes.domain.bo.ProdMaterialBomBo; + +import java.util.Collection; +import java.util.List; + +/** + * 物料BOM信息Service接口 + * + * @author Yinq + * @date 2025-01-08 + */ +public interface IProdMaterialBomService { + + /** + * 查询物料BOM信息 + * + * @param materialBomId 主键 + * @return 物料BOM信息 + */ + ProdMaterialBomVo queryById(Long materialBomId); + + + /** + * 查询符合条件的物料BOM信息列表 + * + * @param bo 查询条件 + * @return 物料BOM信息列表 + */ + List queryList(ProdMaterialBomBo bo); + + /** + * 新增物料BOM信息 + * + * @param bo 物料BOM信息 + * @return 是否新增成功 + */ + Boolean insertByBo(ProdMaterialBomBo bo); + + /** + * 修改物料BOM信息 + * + * @param bo 物料BOM信息 + * @return 是否修改成功 + */ + Boolean updateByBo(ProdMaterialBomBo bo); + + /** + * 校验并批量删除物料BOM信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} 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 new file mode 100644 index 00000000..344669de --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java @@ -0,0 +1,129 @@ +package org.dromara.mes.service.impl; + +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.springframework.stereotype.Service; +import org.dromara.mes.domain.bo.ProdMaterialBomBo; +import org.dromara.mes.domain.vo.ProdMaterialBomVo; +import org.dromara.mes.domain.ProdMaterialBom; +import org.dromara.mes.mapper.ProdMaterialBomMapper; +import org.dromara.mes.service.IProdMaterialBomService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 物料BOM信息Service业务层处理 + * + * @author Yinq + * @date 2025-01-08 + */ +@RequiredArgsConstructor +@Service +public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { + + private final ProdMaterialBomMapper baseMapper; + + /** + * 查询物料BOM信息 + * + * @param materialBomId 主键 + * @return 物料BOM信息 + */ + @Override + public ProdMaterialBomVo queryById(Long materialBomId){ + return baseMapper.selectVoById(materialBomId); + } + + + /** + * 查询符合条件的物料BOM信息列表 + * + * @param bo 查询条件 + * @return 物料BOM信息列表 + */ + @Override + public List queryList(ProdMaterialBomBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(ProdMaterialBomBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdMaterialBom.class) + .selectAll(ProdMaterialBom.class) + .eq(bo.getMaterialBomId() != null, ProdMaterialBom::getMaterialBomId, bo.getMaterialBomId()) + .eq(bo.getParentId() != null, ProdMaterialBom::getParentId, bo.getParentId()) + .eq(bo.getMaterialId() != null, ProdMaterialBom::getMaterialId, bo.getMaterialId()) + .like(StringUtils.isNotBlank(bo.getMaterialName()), ProdMaterialBom::getMaterialName, bo.getMaterialName()) + .like(StringUtils.isNotBlank(bo.getMaterialBomDesc()), ProdMaterialBom::getMaterialBomDesc, bo.getMaterialBomDesc()) + .like(StringUtils.isNotBlank(bo.getMaterialBomVersion()), ProdMaterialBom::getMaterialBomVersion, bo.getMaterialBomVersion()) + .like(StringUtils.isNotBlank(bo.getAncestors()), ProdMaterialBom::getAncestors, bo.getAncestors()) + .eq(bo.getStandardAmount() != null, ProdMaterialBom::getStandardAmount, bo.getStandardAmount()) + .eq(bo.getTopFlag() != null, ProdMaterialBom::getTopFlag, bo.getTopFlag()) + .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()) + .eq(StringUtils.isNotBlank(bo.getMaterialClassfication()), ProdMaterialBom::getMaterialClassfication, bo.getMaterialClassfication()) + .eq(StringUtils.isNotBlank(bo.getAttachId()), ProdMaterialBom::getAttachId, bo.getAttachId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdMaterialBom::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(ProdMaterialBom::getCreateTime); + return lqw; + } + + /** + * 新增物料BOM信息 + * + * @param bo 物料BOM信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ProdMaterialBomBo bo) { + ProdMaterialBom add = MapstructUtils.convert(bo, ProdMaterialBom.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setMaterialBomId(add.getMaterialBomId()); + } + return flag; + } + + /** + * 修改物料BOM信息 + * + * @param bo 物料BOM信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ProdMaterialBomBo bo) { + ProdMaterialBom update = MapstructUtils.convert(bo, ProdMaterialBom.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ProdMaterialBom entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除物料BOM信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} 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 new file mode 100644 index 00000000..7b825cf3 --- /dev/null +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml @@ -0,0 +1,7 @@ + + + + +