物料库

admin/src/main/java/com/fjhx/admin/controller/material/MaterialClassifyController.java

@@ -0,0 +1,66 @@
+package com.fjhx.admin.controller.material;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.admin.entity.material.dto.MaterialClassifyDto;
+import com.fjhx.admin.entity.material.dto.MaterialClassifySelectDto;
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import com.fjhx.admin.service.material.MaterialClassifyService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 物料分类 前端控制器
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@RestController
+@RequestMapping("/materialClassify")
+public class MaterialClassifyController {
+
+    @Autowired
+    private MaterialClassifyService materialClassifyService;
+
+    /**
+     * 物料分类树形
+     */
+    @PostMapping("/tree")
+    public List<JSONObject> tree(@RequestBody MaterialClassify dto) {
+        List<JSONObject> tree = materialClassifyService.tree(dto);
+        return tree;
+    }
+
+    /**
+     * 物料分类新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MaterialClassifyDto materialClassifyDto) {
+        materialClassifyService.add(materialClassifyDto);
+    }
+
+    /**
+     * 物料分类编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody MaterialClassifyDto materialClassifyDto) {
+        materialClassifyService.edit(materialClassifyDto);
+    }
+
+    /**
+     * 物料分类删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        materialClassifyService.delete(dto.getId());
+    }
+
+}

admin/src/main/java/com/fjhx/admin/controller/material/MaterialInfoController.java

@@ -0,0 +1,68 @@
+package com.fjhx.admin.controller.material;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.admin.entity.material.vo.MaterialInfoVo;
+import com.fjhx.admin.entity.material.dto.MaterialInfoSelectDto;
+import com.fjhx.admin.entity.material.dto.MaterialInfoDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.admin.service.material.MaterialInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 物料库 前端控制器
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@RestController
+@RequestMapping("/materialInfo")
+public class MaterialInfoController {
+
+    @Autowired
+    private MaterialInfoService materialInfoService;
+
+    /**
+     * 物料库分页
+     */
+    @PostMapping("/page")
+    public Page<MaterialInfoVo> page(@RequestBody MaterialInfoSelectDto dto) {
+        return materialInfoService.getPage(dto);
+    }
+
+    /**
+     * 物料库明细
+     */
+    @PostMapping("/detail")
+    public MaterialInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return materialInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 物料库新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MaterialInfoDto materialInfoDto) {
+        materialInfoService.add(materialInfoDto);
+    }
+
+    /**
+     * 物料库编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody MaterialInfoDto materialInfoDto) {
+        materialInfoService.edit(materialInfoDto);
+    }
+
+    /**
+     * 物料库删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        materialInfoService.delete(dto.getId());
+    }
+
+}

admin/src/main/java/com/fjhx/admin/controller/product/ProductClassifyController.java

@@ -39,7 +39,6 @@ public class ProductClassifyController {
         return tree;
     }
 
-
     /**
      * 产品分类新增
      */

admin/src/main/java/com/fjhx/admin/entity/material/dto/MaterialClassifyDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.admin.entity.material.dto;
+
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物料分类新增编辑入参实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialClassifyDto extends MaterialClassify {
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/dto/MaterialClassifySelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.admin.entity.material.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物料分类列表查询入参实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialClassifySelectDto extends BaseSelectDto {
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/dto/MaterialInfoDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.admin.entity.material.dto;
+
+import com.fjhx.admin.entity.material.po.MaterialInfo;
+import com.fjhx.file.entity.ObsFile;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 物料库新增编辑入参实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialInfoDto extends MaterialInfo {
+
+    private List<ObsFile> fileList;
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/dto/MaterialInfoSelectDto.java

@@ -0,0 +1,27 @@
+package com.fjhx.admin.entity.material.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物料库列表查询入参实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialInfoSelectDto extends BaseSelectDto {
+
+    /**
+     * 物料类型
+     */
+    private Integer type;
+
+    /**
+     * 物料分类id
+     */
+    private Long materialClassifyId;
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/po/MaterialClassify.java

@@ -0,0 +1,37 @@
+package com.fjhx.admin.entity.material.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 物料分类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+@TableName("material_classify")
+public class MaterialClassify extends BasePo {
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类id集合，用,拼接
+     */
+    private String parentIdSet;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/po/MaterialInfo.java

@@ -0,0 +1,62 @@
+package com.fjhx.admin.entity.material.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 物料库
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+@TableName("material_info")
+public class MaterialInfo extends BasePo {
+
+    /**
+     * 物料分类id
+     */
+    private Long materialClassifyId;
+
+    /**
+     * 物料编码
+     */
+    private String code;
+
+    /**
+     * 物料自定义编码
+     */
+    private String customCode;
+
+    /**
+     * 物料类型
+     */
+    private Integer type;
+
+    /**
+     * 物料名称
+     */
+    private String name;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/vo/MaterialClassifyVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.admin.entity.material.vo;
+
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物料分类列表查询返回值实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialClassifyVo extends MaterialClassify {
+
+}

admin/src/main/java/com/fjhx/admin/entity/material/vo/MaterialInfoVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.admin.entity.material.vo;
+
+import com.fjhx.admin.entity.material.po.MaterialInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物料库列表查询返回值实体
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Getter
+@Setter
+public class MaterialInfoVo extends MaterialInfo {
+
+}

admin/src/main/java/com/fjhx/admin/mapper/material/MaterialClassifyMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.admin.mapper.material;
+
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.admin.entity.material.vo.MaterialClassifyVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 物料分类 Mapper 接口
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+public interface MaterialClassifyMapper extends BaseMapper<MaterialClassify> {
+
+    /**
+     * 物料分类分页
+     */
+    Page<MaterialClassifyVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<MaterialClassify> wrapper);
+
+}

admin/src/main/java/com/fjhx/admin/mapper/material/MaterialInfoMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.admin.mapper.material;
+
+import com.fjhx.admin.entity.material.po.MaterialInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.admin.entity.material.vo.MaterialInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 物料库 Mapper 接口
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
+
+    /**
+     * 物料库分页
+     */
+    Page<MaterialInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<MaterialInfo> wrapper);
+
+}

admin/src/main/java/com/fjhx/admin/service/material/MaterialClassifyService.java

@@ -0,0 +1,42 @@
+package com.fjhx.admin.service.material;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.admin.entity.material.dto.MaterialClassifyDto;
+import com.fjhx.admin.entity.material.dto.MaterialClassifySelectDto;
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 物料分类 服务类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+public interface MaterialClassifyService extends BaseService<MaterialClassify> {
+
+    /**
+     * 物料分类分页
+     */
+    List<JSONObject> tree(MaterialClassify dto);
+
+    /**
+     * 物料分类新增
+     */
+    void add(MaterialClassifyDto materialClassifyDto);
+
+    /**
+     * 物料分类编辑
+     */
+    void edit(MaterialClassifyDto materialClassifyDto);
+
+    /**
+     * 物料分类删除
+     */
+    void delete(Long id);
+
+}

admin/src/main/java/com/fjhx/admin/service/material/MaterialInfoService.java

@@ -0,0 +1,46 @@
+package com.fjhx.admin.service.material;
+
+import com.fjhx.admin.entity.material.po.MaterialInfo;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.admin.entity.material.vo.MaterialInfoVo;
+import com.fjhx.admin.entity.material.dto.MaterialInfoSelectDto;
+import com.fjhx.admin.entity.material.dto.MaterialInfoDto;
+
+
+/**
+ * <p>
+ * 物料库 服务类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+public interface MaterialInfoService extends BaseService<MaterialInfo> {
+
+    /**
+     * 物料库分页
+     */
+    Page<MaterialInfoVo> getPage(MaterialInfoSelectDto dto);
+
+    /**
+     * 物料库明细
+     */
+    MaterialInfoVo detail(Long id);
+
+    /**
+     * 物料库新增
+     */
+    void add(MaterialInfoDto materialInfoDto);
+
+    /**
+     * 物料库编辑
+     */
+    void edit(MaterialInfoDto materialInfoDto);
+
+    /**
+     * 物料库删除
+     */
+    void delete(Long id);
+
+}

admin/src/main/java/com/fjhx/admin/service/material/impl/MaterialClassifyServiceImpl.java

@@ -0,0 +1,95 @@
+package com.fjhx.admin.service.material.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.admin.entity.material.dto.MaterialClassifyDto;
+import com.fjhx.admin.entity.material.po.MaterialClassify;
+import com.fjhx.admin.mapper.material.MaterialClassifyMapper;
+import com.fjhx.admin.service.material.MaterialClassifyService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.TreeUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 物料分类 服务实现类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Service
+public class MaterialClassifyServiceImpl extends ServiceImpl<MaterialClassifyMapper, MaterialClassify> implements MaterialClassifyService {
+
+    @Override
+    public List<JSONObject> tree(MaterialClassify materialClassify) {
+        // 分类名称
+        String name = materialClassify.getName();
+
+        List<MaterialClassify> list = lambdaQuery()
+                .select(MaterialClassify::getId, MaterialClassify::getName, MaterialClassify::getParentId)
+                .like(ObjectUtil.isNotEmpty(name), MaterialClassify::getName, name)
+                .list();
+
+        // 构建树形
+        return TreeUtil.buildTree("name", list);
+    }
+
+    @Override
+    public void add(MaterialClassifyDto materialClassifyDto) {
+        Long parentId = materialClassifyDto.getParentId();
+        if (parentId == null) {
+            materialClassifyDto.setParentId(0L);
+            materialClassifyDto.setParentIdSet(null);
+        } else if (parentId == 0L) {
+            materialClassifyDto.setParentIdSet(null);
+        } else {
+            // 查询父级分类
+            MaterialClassify materialClassify = getById(parentId);
+            if (materialClassify == null) {
+                throw new ServiceException("没有找到父级分类");
+            }
+
+            // 赋值父级id集合
+            String parentIdSet = materialClassify.getParentIdSet();
+            materialClassifyDto.setParentIdSet((ObjectUtil.isEmpty(parentIdSet) ? "" : parentIdSet + ",") + parentId);
+        }
+
+        peerNameOnly(materialClassifyDto.getParentId(), materialClassifyDto.getName(), null);
+
+        this.save(materialClassifyDto);
+    }
+
+    @Override
+    public void edit(MaterialClassifyDto materialClassifyDto) {
+        peerNameOnly(materialClassifyDto.getParentId(), materialClassifyDto.getName(), materialClassifyDto.getId());
+        this.updateById(materialClassifyDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    /**
+     * 保证同级名称不重复
+     */
+    private void peerNameOnly(Long parentId, String classifyName, Long excludeId) {
+
+        Long count = lambdaQuery()
+                .eq(MaterialClassify::getParentId, parentId)
+                .eq(MaterialClassify::getName, classifyName)
+                .ne(ObjectUtil.isNotEmpty(excludeId), MaterialClassify::getId, excludeId)
+                .count();
+
+        if (count != 0) {
+            throw new ServiceException("存在相同分类名称");
+        }
+
+    }
+
+}

admin/src/main/java/com/fjhx/admin/service/material/impl/MaterialInfoServiceImpl.java

@@ -0,0 +1,78 @@
+package com.fjhx.admin.service.material.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.admin.entity.material.dto.MaterialInfoDto;
+import com.fjhx.admin.entity.material.dto.MaterialInfoSelectDto;
+import com.fjhx.admin.entity.material.po.MaterialInfo;
+import com.fjhx.admin.entity.material.vo.MaterialInfoVo;
+import com.fjhx.admin.mapper.material.MaterialInfoMapper;
+import com.fjhx.admin.service.material.MaterialInfoService;
+import com.fjhx.admin.utils.CodeEnum;
+import com.fjhx.file.util.ObsFileUtil;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 物料库 服务实现类
+ * </p>
+ *
+ * @author zlj
+ * @since 2023-03-17
+ */
+@Service
+public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, MaterialInfo> implements MaterialInfoService {
+
+    @Override
+    public Page<MaterialInfoVo> getPage(MaterialInfoSelectDto dto) {
+        IWrapper<MaterialInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("mi", MaterialInfo::getId);
+        wrapper.eq("mi", MaterialInfo::getType, dto.getType());
+        wrapper.eq("mi", MaterialInfo::getMaterialClassifyId, dto.getMaterialClassifyId());
+        wrapper.keyword(dto,
+                new SqlField("mi", MaterialInfo::getName),
+                new SqlField("mi", MaterialInfo::getCode),
+                new SqlField("mi", MaterialInfo::getCustomCode)
+        );
+        Page<MaterialInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public MaterialInfoVo detail(Long id) {
+        MaterialInfo MaterialInfo = this.getById(id);
+        MaterialInfoVo result = BeanUtil.toBean(MaterialInfo, MaterialInfoVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(MaterialInfoDto materialInfoDto) {
+        // 赋值物料编号
+        materialInfoDto.setCode(CodeEnum.MATERIAL.getCode());
+        // 排除名称重复
+        this.nameDuplication(MaterialInfo::getName, materialInfoDto.getName(), "物料名称重复");
+        this.save(materialInfoDto);
+        ObsFileUtil.saveFile(materialInfoDto.getFileList(), materialInfoDto.getId());
+    }
+
+    @Override
+    public void edit(MaterialInfoDto materialInfoDto) {
+        // 禁止产品编号修改
+        materialInfoDto.setCode(null);
+        // 排除名称重复
+        this.nameDuplication(MaterialInfo::getName, materialInfoDto.getName(), materialInfoDto.getId(), "物料名称重复");
+        this.updateById(materialInfoDto);
+        ObsFileUtil.editFile(materialInfoDto.getFileList(), materialInfoDto.getId());
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+        ObsFileUtil.removeFile(id);
+    }
+
+}

admin/src/main/java/com/fjhx/admin/service/product/impl/ProductClassifyServiceImpl.java

@@ -39,6 +39,7 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
         return TreeUtil.buildTree("name", list);
     }
 
+    @Override
     public void add(ProductClassifyDto productClassifyDto) {
 
         Long parentId = productClassifyDto.getParentId();
@@ -56,7 +57,7 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
 
             // 赋值父级id集合
             String parentIdSet = parentClassify.getParentIdSet();
-            parentClassify.setParentIdSet((ObjectUtil.isEmpty(parentIdSet) ? "" : parentIdSet + ",") + parentId);
+            productClassifyDto.setParentIdSet((ObjectUtil.isEmpty(parentIdSet) ? "" : parentIdSet + ",") + parentId);
         }
 
         peerNameOnly(productClassifyDto.getParentId(), productClassifyDto.getName(), null);
@@ -64,11 +65,13 @@ public class ProductClassifyServiceImpl extends ServiceImpl<ProductClassifyMappe
         this.save(productClassifyDto);
     }
 
+    @Override
     public void edit(ProductClassifyDto productClassifyDto) {
         peerNameOnly(productClassifyDto.getParentId(), productClassifyDto.getName(), productClassifyDto.getId());
         this.updateById(productClassifyDto);
     }
 
+    @Override
     public void delete(Long id) {
         this.removeById(id);
     }

admin/src/main/java/com/fjhx/admin/service/product/impl/ProductInfoServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, ProductInfo> implements ProductInfoService {
 
+    @Override
     public Page<ProductInfoVo> getPage(ProductInfoSelectDto dto) {
         IWrapper<ProductInfo> wrapper = getWrapper();
         wrapper.orderByDesc("pi", ProductInfo::getId);
@@ -42,6 +43,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         return page;
     }
 
+    @Override
     public ProductInfoVo detail(Long id) {
         ProductInfo ProductInfo = this.getById(id);
         ProductInfoVo result = BeanUtil.toBean(ProductInfo, ProductInfoVo.class);
@@ -49,6 +51,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Transactional
+    @Override
     public void add(ProductInfoDto productInfoDto) {
         // 赋值产品编号
         productInfoDto.setCode(CodeEnum.PRODUCT.getCode());
@@ -59,6 +62,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Transactional
+    @Override
     public void edit(ProductInfoDto productInfoDto) {
         // 禁止产品编号修改
         productInfoDto.setCode(null);
@@ -69,6 +73,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Transactional
+    @Override
     public void delete(Long id) {
         this.removeById(id);
         ObsFileUtil.removeFile(id);

admin/src/main/java/com/fjhx/admin/utils/CodeEnum.java

@@ -6,6 +6,7 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.admin.service.material.MaterialInfoService;
 import com.fjhx.admin.service.product.ProductInfoService;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.Getter;
@@ -18,6 +19,7 @@ public enum CodeEnum {
 
     // 产品编码
     PRODUCT("P", null, "code", 5, ProductInfoService.class),
+    MATERIAL("M", null, "code", 5, MaterialInfoService.class),
 
     ;
 

admin/src/main/resources/mapper/material/MaterialClassifyMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.admin.mapper.material.MaterialClassifyMapper">
+    <select id="getPage" resultType="com.fjhx.admin.entity.material.vo.MaterialClassifyVo">
+        select
+            mc.id,
+            mc.parent_id,
+            mc.parent_id_set,
+            mc.name,
+            mc.create_user,
+            mc.create_time,
+            mc.update_user,
+            mc.update_time
+        from material_classify mc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

admin/src/main/resources/mapper/material/MaterialInfoMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.admin.mapper.material.MaterialInfoMapper">
+    <select id="getPage" resultType="com.fjhx.admin.entity.material.vo.MaterialInfoVo">
+        select
+            mi.id,
+            mi.material_classify_id,
+            mi.code,
+            mi.custom_code,
+            mi.type,
+            mi.name,
+            mi.spec,
+            mi.unit,
+            mi.remark,
+            mi.create_user,
+            mi.create_time,
+            mi.update_user,
+            mi.update_time
+        from material_info mi
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>