工具信息及参数功能

cuijian

2025-05-15 6b5f508bcd94d3f3d6484075c69d918fae226788

工具信息及参数功能

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -283,5 +283,6 @@
     */
    List<Map> queryTableFieldByParams(@Param("table") String queryTable, @Param("columns") String columns, @Param("paramName") String paramName, @Param("paramValues") String[] paramValues);

    List<DictModel> queryDictItemValueByCodeAndText(@Param("code")String code,@Param("itemText")String itemText);

}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -230,5 +230,12 @@
        </foreach>
    </select>

    <!-- é€šè¿‡å­—å…¸code,itemText获取itemValue -->
    <select id="queryDictItemValueByCodeAndText" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
        select s.item_value as "value",s.item_text as "text" from sys_dict_item s
        where dict_id = (select id from sys_dict where dict_code = #{code})
        and s.item_text = #{itemText}
        order by s.sort_order asc
    </select>

</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/BaseToolsController.java

@@ -1,37 +1,26 @@
package org.jeecg.modules.tms.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.jeecg.modules.tms.entity.*;
import org.jeecg.modules.tms.entity.vo.*;
import org.jeecg.modules.tms.service.*;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -49,6 +38,27 @@
public class BaseToolsController extends JeecgController<BaseTools, IBaseToolsService> {
    @Autowired
    private IBaseToolsService baseToolsService;

     @Autowired
     private IToolsConfigPropertyService toolsConfigPropertyService;

     @Autowired
     private IParaHoleToolsService paraHoleToolsService;

     @Autowired
     private IParaThreadingToolService paraThreadingToolService;

     @Autowired
     private IParaTurningToolsService paraTurningToolsService;

     @Autowired
     private IParaMillToolService paraMillToolService;

     @Autowired
     private IParaCommonToolService paraCommonToolService;

     @Autowired
     private IParaBladeService paraBladeService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -73,32 +83,275 @@
    }
    
    /**
     *   æ·»åŠ 
      * åˆ†é¡µåˆ—表查询
     *
     * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraHolesToolsList")
     public Result<IPage<ParaHolesToolsVo>> paraHolesToolsList(BaseTools baseTools,
                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                          HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaHolesToolsVo> page = new Page<ParaHolesToolsVo>(pageNo, pageSize);
         IPage<ParaHolesToolsVo> pageList = baseToolsService.paraHolesToolsList(page, parameterMap);
         return Result.OK(pageList);
     }

     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraCommonToolList")
     public Result<IPage<ParaCommonToolVo>> paraCommonToolList(BaseTools baseTools,
                                                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                  HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaCommonToolVo> page = new Page<ParaCommonToolVo>(pageNo, pageSize);
         IPage<ParaCommonToolVo> pageList = baseToolsService.paraCommonToolList(page, parameterMap);
         return Result.OK(pageList);
     }

     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraThreadingToolList")
     public Result<IPage<ParaThreadingToolVo>> paraThreadingToolList(BaseTools baseTools,
                                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                          HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaThreadingToolVo> page = new Page<ParaThreadingToolVo>(pageNo, pageSize);
         IPage<ParaThreadingToolVo> pageList = baseToolsService.paraThreadingToolList(page, parameterMap);
         return Result.OK(pageList);
     }

     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraMillToolList")
     public Result<IPage<ParaMillToolVo>> paraMillToolList(BaseTools baseTools,
                                                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                           HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaMillToolVo> page = new Page<ParaMillToolVo>(pageNo, pageSize);
         IPage<ParaMillToolVo> pageList = baseToolsService.paraMillToolList(page, parameterMap);
         return Result.OK(pageList);
     }

     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraTurningToolsList")
     public Result<IPage<ParaTurningToolsVo>> paraTurningToolsList(BaseTools baseTools,
                                                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                   HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaTurningToolsVo> page = new Page<ParaTurningToolsVo>(pageNo, pageSize);
         IPage<ParaTurningToolsVo> pageList = baseToolsService.paraTurningToolsList(page, parameterMap);
         return Result.OK(pageList);
     }

     /**
      * åˆ†é¡µåˆ—表查询
      *
      * @param baseTools
      * @param pageNo
      * @param pageSize
      * @param req
      * @return
      */
     //@AutoLog(value = "tms_base_tools-分页列表查询")
     @ApiOperation(value="tms_base_tools-分页列表查询", notes="tms_base_tools-分页列表查询")
     @GetMapping(value = "/paraBladeList")
     public Result<IPage<ParaBladeVo>> paraBladeList(BaseTools baseTools,
                                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                     HttpServletRequest req) {
         Map<String, String[]> parameterMap = req.getParameterMap();
         Page<ParaBladeVo> page = new Page<ParaBladeVo>(pageNo, pageSize);
         IPage<ParaBladeVo> pageList = baseToolsService.paraBladeList(page, parameterMap);
         return Result.OK(pageList);
     }
	
    /**
     *   æ·»åŠ 
     *
     * @param jSONObject
     * @return
     */
    @AutoLog(value = "tms_base_tools-添加")
    @ApiOperation(value="tms_base_tools-添加", notes="tms_base_tools-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_base_tools:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody BaseTools baseTools) {
        baseToolsService.save(baseTools);
    public Result<String> add(@RequestBody JSONObject jSONObject) {
        BaseTools baseTools = jSONObject.toJavaObject(BaseTools.class);
        String paramaTableName = jSONObject.getString("paraTypeFlag");
        ToolsConfigProperty toolsConfigProperty = jSONObject.toJavaObject(ToolsConfigProperty.class);
        ParaHoleTools paraHoleTools = jSONObject.toJavaObject(ParaHoleTools.class);
        ParaCommonTool paraCommonTool = jSONObject.toJavaObject(ParaCommonTool.class);
        ParaThreadingTool paraThreadingTool = jSONObject.toJavaObject(ParaThreadingTool.class);
        ParaTurningTools paraTurningTools = jSONObject.toJavaObject(ParaTurningTools.class);
        ParaMillTool paraMillTool = jSONObject.toJavaObject(ParaMillTool.class);
        ParaBlade paraBlade = jSONObject.toJavaObject(ParaBlade.class);
        baseTools.setParamaTableName(paramaTableName);
        if(baseToolsService.save(baseTools)){
            toolsConfigProperty.setToolCode(baseTools.getId());
            toolsConfigPropertyService.save(toolsConfigProperty);
            if("1".equals(paramaTableName)){
                paraCommonTool.setToolCode(baseTools.getId());
                paraCommonToolService.save(paraCommonTool);
            }else if("2".equals(paramaTableName)){
                paraHoleTools.setToolCode(baseTools.getId());
                paraHoleToolsService.save(paraHoleTools);
            }else if("3".equals(paramaTableName)){
                paraThreadingTool.setToolCode(baseTools.getId());
                paraThreadingToolService.save(paraThreadingTool);
            }else if("4".equals(paramaTableName)){
                paraMillTool.setToolCode(baseTools.getId());
                paraMillToolService.save(paraMillTool);
            }else if("5".equals(paramaTableName)){
                paraTurningTools.setToolCode(baseTools.getId());
                paraTurningToolsService.save(paraTurningTools);
            }else if("6".equals(paramaTableName)){
                paraBlade.setToolCode(baseTools.getId());
                paraBladeService.save(paraBlade);
            }
        }
        return Result.OK("添加成功！");
    }
    
    /**
     *  ç¼–辑
     *
     * @param baseTools
     * @param jSONObject
     * @return
     */
    @AutoLog(value = "tms_base_tools-编辑")
    @ApiOperation(value="tms_base_tools-编辑", notes="tms_base_tools-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_base_tools:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody BaseTools baseTools) {
        baseToolsService.updateById(baseTools);
    public Result<String> edit(@RequestBody JSONObject jSONObject) {
        BaseTools baseTools = jSONObject.toJavaObject(BaseTools.class);
        ToolsConfigProperty toolsConfigProperty = jSONObject.toJavaObject(ToolsConfigProperty.class);
        ParaHoleTools paraHoleTools = jSONObject.toJavaObject(ParaHoleTools.class);
        ParaCommonTool paraCommonTool = jSONObject.toJavaObject(ParaCommonTool.class);
        ParaThreadingTool paraThreadingTool = jSONObject.toJavaObject(ParaThreadingTool.class);
        ParaTurningTools paraTurningTools = jSONObject.toJavaObject(ParaTurningTools.class);
        ParaMillTool paraMillTool = jSONObject.toJavaObject(ParaMillTool.class);
        ParaBlade paraBlade = jSONObject.toJavaObject(ParaBlade.class);
        if(baseToolsService.updateById(baseTools)){
            ToolsConfigProperty toolsConfigProperty1 = toolsConfigPropertyService.lambdaQuery().eq(ToolsConfigProperty::getToolCode,baseTools.getId()).one();
            if(toolsConfigProperty1 != null){
                toolsConfigProperty.setId(toolsConfigProperty1.getId());
                toolsConfigProperty.setToolCode(baseTools.getId());
                toolsConfigPropertyService.updateById(toolsConfigProperty);
            }else {
                toolsConfigProperty.setToolCode(baseTools.getId());
                toolsConfigPropertyService.save(toolsConfigProperty);
            }
            if("1".equals(baseTools.getParamaTableName())){
                ParaCommonTool paraCommonTool1 = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,baseTools.getId()).one();
                if(paraCommonTool1 != null){
                    paraCommonTool.setId(paraCommonTool1.getId());
                    paraCommonTool.setToolCode(baseTools.getId());
                    paraCommonToolService.updateById(paraCommonTool);
                }else {
                    paraCommonTool.setToolCode(baseTools.getId());
                    paraCommonToolService.save(paraCommonTool);
                }
            }else if("2".equals(baseTools.getParamaTableName())){
                ParaHoleTools paraHoleTools1 = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,baseTools.getId()).one();
                if(paraHoleTools1 != null){
                    paraHoleTools.setId(paraHoleTools1.getId());
                    paraHoleTools.setToolCode(baseTools.getId());
                    paraHoleToolsService.updateById(paraHoleTools);
                }else {
                    paraHoleTools.setToolCode(baseTools.getId());
                    paraHoleToolsService.save(paraHoleTools);
                }
            }else if("3".equals(baseTools.getParamaTableName())){
                ParaThreadingTool paraThreadingTool1 = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,baseTools.getId()).one();
                if(paraThreadingTool1 != null){
                    paraThreadingTool.setId(paraThreadingTool1.getId());
                    paraThreadingTool.setToolCode(baseTools.getId());
                    paraThreadingToolService.updateById(paraThreadingTool);
                }else {
                    paraThreadingTool.setToolCode(baseTools.getId());
                    paraThreadingToolService.save(paraThreadingTool);
                }
            }else if("4".equals(baseTools.getParamaTableName())){
                ParaMillTool paraMillTool1 = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,baseTools.getId()).one();
                if(paraMillTool1 != null){
                    paraMillTool.setId(paraMillTool1.getId());
                    paraMillTool.setToolCode(baseTools.getId());
                    paraMillToolService.updateById(paraMillTool);
                }else {
                    paraMillTool.setToolCode(baseTools.getId());
                    paraMillToolService.save(paraMillTool);
                }
            }else if("5".equals(baseTools.getParamaTableName())){
                ParaTurningTools paraTurningTools1 = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,baseTools.getId()).one();
                if(paraTurningTools1 != null){
                    paraTurningTools.setId(paraTurningTools1.getId());
                    paraTurningTools.setToolCode(baseTools.getId());
                    paraTurningToolsService.updateById(paraTurningTools);
                }else {
                    paraTurningTools.setToolCode(baseTools.getId());
                    paraTurningToolsService.save(paraTurningTools);
                }
            }else if("6".equals(baseTools.getParamaTableName())){
                ParaBlade paraBlade1 = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,baseTools.getId()).one();
                if(paraBlade1 != null){
                    paraBlade.setId(paraBlade1.getId());
                    paraBlade.setToolCode(baseTools.getId());
                    paraBladeService.updateById(paraBlade);
                }else {
                    paraBlade.setToolCode(baseTools.getId());
                    paraBladeService.save(paraBlade);
                }
            }
        }
        return Result.OK("编辑成功!");
    }
    
@@ -114,6 +367,42 @@
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        baseToolsService.removeById(id);
        BaseTools baseTools = baseToolsService.getById(id);
        ToolsConfigProperty toolsConfigProperty = toolsConfigPropertyService.lambdaQuery().eq(ToolsConfigProperty::getToolCode,baseTools.getId()).one();
        if(toolsConfigProperty != null){
            toolsConfigPropertyService.removeById(toolsConfigProperty.getId());
        }
        if("1".equals(baseTools.getParamaTableName())){
            ParaCommonTool paraCommonTool = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,baseTools.getId()).one();
            if(paraCommonTool != null){
                paraCommonToolService.removeById(paraCommonTool.getId());
            }
        }else if("2".equals(baseTools.getParamaTableName())){
            ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,baseTools.getId()).one();
            if(paraHoleTools != null){
                paraHoleToolsService.removeById(paraHoleTools.getId());
            }
        }else if("3".equals(baseTools.getParamaTableName())){
            ParaThreadingTool paraThreadingTool = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,baseTools.getId()).one();
            if(paraThreadingTool != null){
                paraThreadingToolService.removeById(paraThreadingTool.getId());
            }
        }else if("4".equals(baseTools.getParamaTableName())){
            ParaMillTool paraMillTool = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,baseTools.getId()).one();
            if(paraMillTool != null){
                paraMillToolService.removeById(paraMillTool.getId());
            }
        }else if("5".equals(baseTools.getParamaTableName())){
            ParaTurningTools paraTurningTools = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,baseTools.getId()).one();
            if(paraTurningTools != null){
                paraTurningToolsService.removeById(paraTurningTools.getId());
            }
        }else if("6".equals(baseTools.getParamaTableName())){
            ParaBlade paraBlade = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,baseTools.getId()).one();
            if(paraBlade != null){
                paraBladeService.removeById(paraBlade.getId());
            }
        }
        return Result.OK("删除成功!");
    }
    
@@ -174,4 +463,35 @@
        return super.importExcel(request, response, BaseTools.class);
    }

     /**
      * é€šè¿‡å·¥å…·id查询
      *
      * @param toolCode
      * @return
      */
     @GetMapping(value = "/queryByToolCode")
     public Result<?> queryByToolCode(@RequestParam(name="toolCode",required=true) String toolCode,@RequestParam(name="paraTypeFlag",required=true) String paraTypeFlag) {
         if("1".equals(paraTypeFlag)){
             ParaCommonTool paraCommonTool = paraCommonToolService.lambdaQuery().eq(ParaCommonTool::getToolCode,toolCode).one();
             return Result.OK(paraCommonTool);
         }else if("2".equals(paraTypeFlag)){
             ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,toolCode).one();
             return Result.OK(paraHoleTools);
         }else if("3".equals(paraTypeFlag)){
             ParaThreadingTool paraThreadingTool = paraThreadingToolService.lambdaQuery().eq(ParaThreadingTool::getToolCode,toolCode).one();
             return Result.OK(paraThreadingTool);
         }else if("4".equals(paraTypeFlag)){
             ParaMillTool paraMillTool = paraMillToolService.lambdaQuery().eq(ParaMillTool::getToolCode,toolCode).one();
             return Result.OK(paraMillTool);
         }else if("5".equals(paraTypeFlag)){
             ParaTurningTools paraTurningTools = paraTurningToolsService.lambdaQuery().eq(ParaTurningTools::getToolCode,toolCode).one();
             return Result.OK(paraTurningTools);
         }else if("6".equals(paraTypeFlag)){
            ParaBlade paraBlade = paraBladeService.lambdaQuery().eq(ParaBlade::getToolCode,toolCode).one();
             return Result.OK(paraBlade);
         }else {
             return Result.OK("");
         }
     }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ParaHoleToolsController.java

@@ -439,4 +439,16 @@
        }
    }

    /**
     * é€šè¿‡å·¥å…·id查询
     *
     * @param toolCode
     * @return
     */
    @GetMapping(value = "/queryByToolCode")
    public Result<ParaHoleTools> queryByToolCode(@RequestParam(name="toolCode",required=true) String toolCode) {
        ParaHoleTools paraHoleTools = paraHoleToolsService.lambdaQuery().eq(ParaHoleTools::getToolCode,toolCode).one();
        return Result.OK(paraHoleTools);
    }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsClassifyController.java

@@ -1,8 +1,6 @@
package org.jeecg.modules.tms.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -10,11 +8,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.jeecg.common.api.vo.CommonGenericTree;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.entity.Warehouse;
import org.jeecg.modules.tms.service.IToolsClassifyService;
@@ -54,6 +54,9 @@
    @Autowired
    private IToolsClassifyService toolsClassifyService;
    
     @Autowired
     private ISysBusinessCodeRuleService businessCodeRuleService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -87,6 +90,28 @@
    //@RequiresPermissions("org.jeecg.modules:tms_tools_classify:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ToolsClassify toolsClassify) {
        //根据编码规则生成工具分类编码
        if("1".equals(toolsClassify.getEncodingType())){
            toolsClassify.setClassifyId(businessCodeRuleService.generateBusinessCodeSeq("ToolsClassify"));
        }else if("2".equals(toolsClassify.getEncodingType())){
            String classifyIds = "";
            String classifyId = toolsClassify.getClassifyId();
            String parentId = toolsClassify.getParentId();
            while (StringUtils.isNotBlank(classifyId)){
                classifyIds = classifyId+classifyIds;
                //获取父节点的编码
                ToolsClassify parentToolsClassify = toolsClassifyService.getById(parentId);
                if(parentToolsClassify != null && StringUtils.isNotBlank(parentToolsClassify.getClassifyId()) && !"0".equals(parentToolsClassify.getClassifyId())){
                    classifyId = parentToolsClassify.getClassifyId();
                    parentId = parentToolsClassify.getParentId();
                }else{
                    classifyId = "";
                }
            }
            toolsClassify.setClassifyId(classifyIds);
        }else if("3".equals(toolsClassify.getEncodingType())){
            toolsClassify.setClassifyId(toolsClassify.getClassifyId());
        }
        toolsClassify.setStatus("1");
        toolsClassifyService.save(toolsClassify);
        return Result.OK("添加成功！");

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsConfigPropertyController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,190 @@
package org.jeecg.modules.tms.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import org.jeecg.modules.tms.entity.ToolsConfigProperty;
import org.jeecg.modules.tms.service.IToolsConfigPropertyService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
 * @Description: tms_tools_config_property
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
@Api(tags="tms_tools_config_property")
@RestController
@RequestMapping("/tms/toolsConfigProperty")
@Slf4j
public class ToolsConfigPropertyController extends JeecgController<ToolsConfigProperty, IToolsConfigPropertyService> {
    @Autowired
    private IToolsConfigPropertyService toolsConfigPropertyService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param toolsConfigProperty
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "tms_tools_config_property-分页列表查询")
    @ApiOperation(value="tms_tools_config_property-分页列表查询", notes="tms_tools_config_property-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<ToolsConfigProperty>> queryPageList(ToolsConfigProperty toolsConfigProperty,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<ToolsConfigProperty> queryWrapper = QueryGenerator.initQueryWrapper(toolsConfigProperty, req.getParameterMap());
        Page<ToolsConfigProperty> page = new Page<ToolsConfigProperty>(pageNo, pageSize);
        IPage<ToolsConfigProperty> pageList = toolsConfigPropertyService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param toolsConfigProperty
     * @return
     */
    @AutoLog(value = "tms_tools_config_property-添加")
    @ApiOperation(value="tms_tools_config_property-添加", notes="tms_tools_config_property-添加")
    //@RequiresPermissions("org.jeecg.modules:tms_tools_config_property:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody ToolsConfigProperty toolsConfigProperty) {
        toolsConfigPropertyService.save(toolsConfigProperty);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param toolsConfigProperty
     * @return
     */
    @AutoLog(value = "tms_tools_config_property-编辑")
    @ApiOperation(value="tms_tools_config_property-编辑", notes="tms_tools_config_property-编辑")
    //@RequiresPermissions("org.jeecg.modules:tms_tools_config_property:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody ToolsConfigProperty toolsConfigProperty) {
        toolsConfigPropertyService.updateById(toolsConfigProperty);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "tms_tools_config_property-通过id删除")
    @ApiOperation(value="tms_tools_config_property-通过id删除", notes="tms_tools_config_property-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:tms_tools_config_property:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        toolsConfigPropertyService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "tms_tools_config_property-批量删除")
    @ApiOperation(value="tms_tools_config_property-批量删除", notes="tms_tools_config_property-批量删除")
    //@RequiresPermissions("org.jeecg.modules:tms_tools_config_property:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.toolsConfigPropertyService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "tms_tools_config_property-通过id查询")
    @ApiOperation(value="tms_tools_config_property-通过id查询", notes="tms_tools_config_property-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<ToolsConfigProperty> queryById(@RequestParam(name="id",required=true) String id) {
        ToolsConfigProperty toolsConfigProperty = toolsConfigPropertyService.getById(id);
        if(toolsConfigProperty==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(toolsConfigProperty);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param toolsConfigProperty
    */
    //@RequiresPermissions("org.jeecg.modules:tms_tools_config_property:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, ToolsConfigProperty toolsConfigProperty) {
        return super.exportXls(request, toolsConfigProperty, ToolsConfigProperty.class, "tms_tools_config_property");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("tms_tools_config_property:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, ToolsConfigProperty.class);
    }

     /**
      * é€šè¿‡å·¥å…·id查询
      *
      * @param toolCode
      * @return
      */
     @GetMapping(value = "/queryByToolCode")
     public Result<ToolsConfigProperty> queryByToolCode(@RequestParam(name="toolCode",required=true) String toolCode) {
         ToolsConfigProperty toolsConfigProperty = toolsConfigPropertyService.lambdaQuery().eq(ToolsConfigProperty::getToolCode,toolCode).one();
         return Result.OK(toolsConfigProperty);
     }

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ParaThreadingTool.java

@@ -148,9 +148,9 @@
    @Excel(name = "排屑槽型", width = 15)
    @ApiModelProperty(value = "排屑槽型")
    private String fluteSoltType;
    /**排屑槽型*/
    @Excel(name = "排屑槽型", width = 15)
    @ApiModelProperty(value = "排屑槽型")
    /**螺纹类型*/
    @Excel(name = "螺纹类型", width = 15)
    @ApiModelProperty(value = "螺纹类型")
    private String threadType;
    /**导向尺寸*/
    @Excel(name = "导向尺寸", width = 15)

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsConfigProperty.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,151 @@
package org.jeecg.modules.tms.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: tms_tools_config_property
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
@Data
@TableName("tms_tools_config_property")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tms_tools_config_property对象", description="tms_tools_config_property")
public class ToolsConfigProperty implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**分类编号*/
    @Excel(name = "分类编号", width = 15)
    @ApiModelProperty(value = "分类编号")
    private String classifyId;
    /**工具信息id*/
    @Excel(name = "工具信息id", width = 15)
    @ApiModelProperty(value = "工具信息id")
    private String toolCode;
    /**中文名称*/
    @Excel(name = "中文名称", width = 15)
    @ApiModelProperty(value = "中文名称")
    private String chineseName;
    /**英文名称*/
    @Excel(name = "英文名称", width = 15)
    @ApiModelProperty(value = "英文名称")
    private String foreignLanguageName;
    /**工具类型;1.通用 2.专用*/
    @Excel(name = "工具类型;1.通用 2.专用", width = 15)
    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private java.lang.String applicationType;
    /**标准级别*/
    @Excel(name = "标准级别", width = 15)
    @ApiModelProperty(value = "标准级别")
    private java.lang.String standardLevel;
    /**标准号*/
    @Excel(name = "标准号", width = 15)
    @ApiModelProperty(value = "标准号")
    private java.lang.String standardCode;
    /**型号/图号*/
    @Excel(name = "型号/图号", width = 15)
    @ApiModelProperty(value = "型号/图号")
    private java.lang.String toolModel;
    /**厂家*/
    @Excel(name = "厂家", width = 15)
    @ApiModelProperty(value = "厂家")
    private java.lang.String supplierId;
    /**仓库省份城市*/
    @Excel(name = "仓库省份城市", width = 15)
    @ApiModelProperty(value = "仓库省份城市")
    private java.lang.String provinceCity;
    /**库区/库号*/
    @Excel(name = "库区/库号", width = 15)
    @ApiModelProperty(value = "库区/库号")
    private java.lang.String warehouseId;
    /**库位号;由库区+层+排+列组成，可以是多个库位号以英文点号分割的字符串。*/
    @Excel(name = "库位号;由库区+层+排+列组成，可以是多个库位号以英文点号分割的字符串。", width = 15)
    @ApiModelProperty(value = "库位号;由库区+层+排+列组成，可以是多个库位号以英文点号分割的字符串。")
    private java.lang.String positionCode;
    /**存储位置（偏那个厂区的库）*/
    @Excel(name = "存储位置（偏那个厂区的库）", width = 15)
    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private java.lang.String storageLocation;
    /**计量主单位*/
    @Excel(name = "计量主单位", width = 15)
    @ApiModelProperty(value = "计量主单位")
    private java.lang.String mainUnit;
    /**计量辅单位*/
    @Excel(name = "计量辅单位", width = 15)
    @ApiModelProperty(value = "计量辅单位")
    private java.lang.String auxiliaryUnit;
    /**计量主单位数量*/
    @Excel(name = "计量主单位数量", width = 15)
    @ApiModelProperty(value = "计量主单位数量")
    private java.lang.String mainCount;
    /**计量辅单位数量*/
    @Excel(name = "计量辅单位数量", width = 15)
    @ApiModelProperty(value = "计量辅单位数量")
    private java.lang.String auxiliaryCount;
    /**是否有计量辅单位;1,有辅助单位2.无辅助单位*/
    @Excel(name = "是否有计量辅单位;1,有辅助单位2.无辅助单位", width = 15)
    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private java.lang.String auxiliaryUnitFlag;
    /**单价*/
    @Excel(name = "单价", width = 15)
    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;
    /**最低库存*/
    @Excel(name = "最低库存", width = 15)
    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;
    /**最高库存*/
    @Excel(name = "最高库存", width = 15)
    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;
    /**状态;1.启用 2.未启用*/
    @Excel(name = "状态;1.启用 2.未启用", width = 15)
    @ApiModelProperty(value = "状态;1.启用 2.未启用")
    private java.lang.String status;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private java.lang.String remark;
    /**租户号*/
    @Excel(name = "租户号", width = 15)
    @ApiModelProperty(value = "租户号")
    private java.lang.String tenantId;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private java.lang.String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private java.util.Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private java.lang.String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private java.util.Date updateTime;
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaBladeVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,165 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;


@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaBladeVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private String applicationType;

    @ApiModelProperty(value = "厂家")
    private String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;

    @ApiModelProperty(value = "刀片形状")
    private String bladeShape;

    @ApiModelProperty(value = "刀片长度")
    private String bladeLength;

    @ApiModelProperty(value = "切削刃数")
    private String cuttingEdgeCount;

    @ApiModelProperty(value = "刀片厚度")
    private String bladeThickness;

    @ApiModelProperty(value = "夹固型式")
    private String clampingType;

    @ApiModelProperty(value = "刀尖R")
    private String noseAngleR;

    @ApiModelProperty(value = "刀片材料")
    private String toolMaterial;

    @ApiModelProperty(value = "零件材料")
    private String partMaterial;

    @ApiModelProperty(value = "是否涂层")
    private String paintcoatFlag;

    @ApiModelProperty(value = "附加技术条件")
    private String technicalConditions;

    @ApiModelProperty(value = "附加技术条件说明")
    private String conditionsInfo;

    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value = "制式")
    private String types;

    @ApiModelProperty(value = "涂层材质")
    private String coatingMaterial;

    @ApiModelProperty(value = "加工分类")
    private String processingClassify;

    @ApiModelProperty(value = "刀片后角")
    private String bladePosterior;

    @ApiModelProperty(value = "切削方向")
    private String cuttingDirection;

    @ApiModelProperty(value = "刀片宽度")
    private String bladeWide;

    @ApiModelProperty(value = "刀片尺寸")
    private String bladeSize;

    @ApiModelProperty(value = "内外螺纹")
    private String inOutThread;

    @ApiModelProperty(value = "螺纹标准")
    private String threadStandard;

    @ApiModelProperty(value = "牙型角度")
    private String dentalAngle;

    @ApiModelProperty(value = "螺距")
    private String pitch;

    @ApiModelProperty(value = "最小加工内螺纹公称直径")
    private String minInternalThread;

    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaCommonToolVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private String applicationType;

    @ApiModelProperty(value = "厂家")
    private String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;

    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaHolesToolsVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;


@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaHolesToolsVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private java.lang.String applicationType;

    @ApiModelProperty(value = "厂家")
    private java.lang.String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private java.lang.String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private java.lang.String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private java.lang.String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private java.lang.String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private java.lang.String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;

    @ApiModelProperty(value = "直径")
    private String diameter;

    @ApiModelProperty(value = "切削刃锥角")
    private String coneAngle;

    @ApiModelProperty(value = "切削刃长")
    private String edgeLength;

    @ApiModelProperty(value = "刀具总长")
    private String totalLength;

    @ApiModelProperty(value = "刀具材料")
    private String toolMaterial;

    @ApiModelProperty(value = "零件材料")
    private String partMaterial;

    @ApiModelProperty(value = "是否涂层")
    private String paintcoatFlag;

    @ApiModelProperty(value = "刀具型式")
    private String toolPattern;

    @ApiModelProperty(value = "柄部规格")
    private String handleSpecifications;

    @ApiModelProperty(value = "冷却方式")
    private String coolingMethod;

    @ApiModelProperty(value = "附加技术条件")
    private String technicalConditions;

    @ApiModelProperty(value = "附加技术条件说明")
    private String conditionsInfo;

    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value = "制式")
    private String types;

    @ApiModelProperty(value = "公差等级")
    private String toleranceClass;

    @ApiModelProperty(value = "排屑槽形式")
    private String fluteForm;

    @ApiModelProperty(value = "柄部形式")
    private String handleForm;

    @ApiModelProperty(value = "刃数")
    private String bladeCount;

    @ApiModelProperty(value = "最小直径")
    private String smallDiameter;

    @ApiModelProperty(value = "倒角角度")
    private String chamferAngle;

    @ApiModelProperty(value = "适配刀片-刀头-刀杆")
    private String fitterPart;

    @ApiModelProperty(value = "有效加工长度")
    private String effectiveLength;

    @ApiModelProperty(value = "钻头直径范围")
    private String drillDiameterRange;

    @ApiModelProperty(value = "刀杆直径")
    private String knifeDiameter;

    @ApiModelProperty(value = "孔径")
    private String boreDiameter;

    @ApiModelProperty(value = "接口形式")
    private String connectorType;

    @ApiModelProperty(value = "接口槽长规格")
    private String slotSpecification;

    @ApiModelProperty(value = "适用范围")
    private String scopeOfApplication;

    @ApiModelProperty(value = "最新镗孔直径")
    private String latestBoringDiameter;

    @ApiModelProperty(value = "最大镗孔直径")
    private String maxBoringDiameter;

    @ApiModelProperty(value = "加工方式")
    private String processingmethod;

    @ApiModelProperty(value = "刀头数")
    private String headsNumber;

    @ApiModelProperty(value = "适配刀座")
    private String adaptHolder;

    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaMillToolVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,193 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;


@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaMillToolVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private String applicationType;

    @ApiModelProperty(value = "厂家")
    private String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;


    @ApiModelProperty(value = "刀具直径")
    private String diameter;

    @ApiModelProperty(value = "刀尖角R")
    private String noseAngleR;

    @ApiModelProperty(value = "齿数")
    private String numberOfTeeth;

    @ApiModelProperty(value = "切削刃长")
    private String edgeLength;

    @ApiModelProperty(value = "刀具总长")
    private String totalLength;

    @ApiModelProperty(value = "刀具材料")
    private String toolMaterial;

    @ApiModelProperty(value = "零件材料")
    private String partMaterial;

    @ApiModelProperty(value = "是否涂层")
    private String paintcoatFlag;

    @ApiModelProperty(value = "刀具型式")
    private String toolPattern;

    @ApiModelProperty(value = "装夹规格")
    private String clampingSpecifications;

    @ApiModelProperty(value = "冷却方式")
    private String coolingMethod;

    @ApiModelProperty(value = "附加技术条件")
    private String technicalConditions;

    @ApiModelProperty(value = "附加技术条件说明")
    private String conditionsInfo;

    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value = "颈径")
    private String neckDiameter;

    @ApiModelProperty(value = "柄部形式")
    private String handleForm;

    @ApiModelProperty(value = "刀尖角C")
    private String noseAngleC;

    @ApiModelProperty(value = "刀尖角内R")
    private String angleInsideR;

    @ApiModelProperty(value = "最小直径")
    private String smallDiameter;

    @ApiModelProperty(value = "刀具角度")
    private String toolAngle;

    @ApiModelProperty(value = "柄长")
    private String handleLength;

    @ApiModelProperty(value = "主偏角K")
    private String mainAngleK;

    @ApiModelProperty(value = "最大切深")
    private String deepestDepth;

    @ApiModelProperty(value = "适配刀片")
    private String adaptBlade;

    @ApiModelProperty(value = "柄颈形式")
    private String handleNeckForm;

    @ApiModelProperty(value = "柄颈长度")
    private String handleNeckLength;

    @ApiModelProperty(value = "接口尺寸规格")
    private String sizeSpecifications;

    @ApiModelProperty(value = "铣刀头形式")
    private String millingHeadForm;

    @ApiModelProperty(value = "悬伸长度")
    private String overhangingLength;

    @ApiModelProperty(value = "切削刃形式")
    private String cuttingEdgeForm;

    @ApiModelProperty(value = "内外纹数")
    private String numberPatterns;

    @ApiModelProperty(value = "螺距")
    private String pitch;

    @ApiModelProperty(value = "最近加工直径")
    private String recentlyDiameter;

    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaThreadingToolVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,162 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;


@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaThreadingToolVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private String applicationType;

    @ApiModelProperty(value = "厂家")
    private String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;

    @ApiModelProperty(value = "螺纹代号")
    private String threadCode;

    @ApiModelProperty(value = "螺距")
    private String pitch;

    @ApiModelProperty(value = "螺纹旋向")
    private String rotationDirection;

    @ApiModelProperty(value = "螺纹公差带代号/精度等级")
    private String tolerancezoneLevel;

    @ApiModelProperty(value = "切削刃长")
    private String edgeLength;

    @ApiModelProperty(value = "刀具总长")
    private String totalLength;

    @ApiModelProperty(value = "刀具材料")
    private String toolMaterial;

    @ApiModelProperty(value = "零件材料")
    private String partMaterial;

    @ApiModelProperty(value = "是否涂层")
    private String paintcoatFlag;

    @ApiModelProperty(value = "外型尺寸")
    private String externalDimensions;

    @ApiModelProperty(value = "柄部规格")
    private String handleSpecifications;

    @ApiModelProperty(value = "附件技术条件")
    private String technicalConditions;

    @ApiModelProperty(value = "附件技术条件说明")
    private String conditionsInfo;

    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value = "制式")
    private String types;

    @ApiModelProperty(value = "螺孔类型")
    private String screwHoleType;

    @ApiModelProperty(value = "冷却方式")
    private String coolingMethod;

    @ApiModelProperty(value = "螺纹标准")
    private String threadStandard;

    @ApiModelProperty(value = "排屑槽型")
    private String fluteSoltType;

    @ApiModelProperty(value = "螺纹类型")
    private String threadType;

    @ApiModelProperty(value = "导向尺寸")
    private String guidingSize;

    @ApiModelProperty(value = "连接孔径")
    private String connectionAperture;

    @ApiModelProperty(value = "连接键槽")
    private String connectingKeyway;

    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaTurningToolsVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,200 @@
package org.jeecg.modules.tms.entity.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;


@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ParaTurningToolsVo implements Serializable {
    private static final long serialVersionUID = 1L;

    private String id;
    @ApiModelProperty(value = "分类id")
    private String classifyId;

    @ApiModelProperty(value = "分类编号")
    private String classifyNum;

    @ApiModelProperty(value = "分类名称")
    private String classifyName;

    @ApiModelProperty(value = "工具编码")
    private String toolCode;

    @ApiModelProperty(value = "工具编号")
    private String toolId;

    @ApiModelProperty(value = "序号（或企业内码）")
    private String signCode;

    @ApiModelProperty(value = "中文名称")
    private String chineseName;

    @ApiModelProperty(value = "外文名称")
    private String foreignLanguageName;

    @ApiModelProperty(value = "标注级别")
    private String standardLevel;

    @ApiModelProperty(value = "标准号")
    private String standardCode;

    @ApiModelProperty(value = "型号/图号")
    private String toolModel;

    @ApiModelProperty(value = "参数表名称")
    private String paramaTableName;

    @ApiModelProperty(value = "库位号（展示时、可以多个拼接）;展示时、可以多个拼接成多个库位号的字符串，进行伪列展示。")
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    private String applicationType;

    @ApiModelProperty(value = "厂家")
    private String supplierId;

    @ApiModelProperty(value = "仓库省份城市")
    private String provinceCity;

    @ApiModelProperty(value = "存储位置（偏那个厂区的库）")
    private String storageLocation;

    @ApiModelProperty(value = "计量主单位")
    private String mainUnit;

    @ApiModelProperty(value = "计量辅单位")
    private String auxiliaryUnit;

    @ApiModelProperty(value = "是否有计量辅单位;1,有辅助单位2.无辅助单位")
    private String auxiliaryUnitFlag;

    @ApiModelProperty(value = "单价")
    private java.math.BigDecimal price;

    @ApiModelProperty(value = "最低库存")
    private java.math.BigDecimal lowerInventory;

    @ApiModelProperty(value = "最高库存")
    private java.math.BigDecimal highestInventory;

    @ApiModelProperty(value = "刀头规格")
    private String headSpecifications;

    @ApiModelProperty(value = "配套刀片号")
    private String matchingNumber;

    @ApiModelProperty(value = "主偏角")
    private String leadAngle;

    @ApiModelProperty(value = "刀具截面尺寸")
    private String crossSectionalSize;

    @ApiModelProperty(value = "刀具总长")
    private String totalLength;

    @ApiModelProperty(value = "切削方向")
    private String cuttingDirection;

    @ApiModelProperty(value = "刀具材料")
    private String toolMaterial;

    @ApiModelProperty(value = "零件材料")
    private String partMaterial;

    @ApiModelProperty(value = "刀具型式")
    private String toolPattern;

    @ApiModelProperty(value = "是否涂层")
    private String paintcoatFlag;

    @ApiModelProperty(value = "附加技术条件")
    private String technicalConditions;

    @ApiModelProperty(value = "附加技术条件说明")
    private String conditionsInfo;

    @ApiModelProperty(value = "品牌")
    private String brand;

    @ApiModelProperty(value = "制式")
    private String types;

    @ApiModelProperty(value = "刀片尺寸")
    private String knifeSize;

    @ApiModelProperty(value = "冷却方式")
    private String coolingMethod;

    @ApiModelProperty(value = "刀杆类别")
    private String holderCategory;

    @ApiModelProperty(value = "刀具直径")
    private String toolDiameter;

    @ApiModelProperty(value = "接口紧固形式")
    private String fasteningForm;

    @ApiModelProperty(value = "镗杆直径")
    private String boringBarDiameter;

    @ApiModelProperty(value = "刀杆长度")
    private String bladeLength;

    @ApiModelProperty(value = "刀片形状")
    private String bladeShape;

    @ApiModelProperty(value = "刀片后角")
    private String bladePosterior;

    @ApiModelProperty(value = "刀杆方向")
    private String barDirection;

    @ApiModelProperty(value = "刀杆高度")
    private String bladeHeight;

    @ApiModelProperty(value = "刀杆宽度")
    private String bladeWide;

    @ApiModelProperty(value = "刀杆尺寸")
    private String bladeSize;

    @ApiModelProperty(value = "刀夹型号")
    private String knifeClipModel;

    @ApiModelProperty(value = "刀片装夹方式")
    private String clampingMethod;

    @ApiModelProperty(value = "刀片槽宽")
    private String slotWidth;

    @ApiModelProperty(value = "最小切入直径")
    private String smallDiameter;

    @ApiModelProperty(value = "最大切入直径")
    private String maxDiameter;

    @ApiModelProperty(value = "最大切槽深度")
    private String maxDepth;

    @ApiModelProperty(value = "刀杆形式")
    private String knifeBarForm;

    @ApiModelProperty(value = "刀板厚度")
    private String bladeThickness;

    @ApiModelProperty(value = "最小加工直径")
    private String minDiameter;
    @ApiModelProperty(value = "备注")
    private String remark;

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/BaseToolsMapper.java

@@ -1,10 +1,13 @@
package org.jeecg.modules.tms.mapper;

import java.util.List;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.BaseTools;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.tms.entity.vo.*;

/**
 * @Description: tms_base_tools
@@ -14,4 +17,22 @@
 */
public interface BaseToolsMapper extends BaseMapper<BaseTools> {

    IPage<ParaHolesToolsVo> paraHolesToolsList(Page<ParaHolesToolsVo> page,
                                         @Param(Constants.WRAPPER) Wrapper<ParaHolesToolsVo> queryWrapper);

    IPage<ParaCommonToolVo> paraCommonToolList(Page<ParaCommonToolVo> page,
                                               @Param(Constants.WRAPPER) Wrapper<ParaCommonToolVo> queryWrapper);

    IPage<ParaThreadingToolVo> paraThreadingToolList(Page<ParaThreadingToolVo> page,
                                                     @Param(Constants.WRAPPER) Wrapper<ParaThreadingToolVo> queryWrapper);

    IPage<ParaMillToolVo> paraMillToolList(Page<ParaMillToolVo> page,
                                           @Param(Constants.WRAPPER) Wrapper<ParaMillToolVo> queryWrapper);

    IPage<ParaTurningToolsVo> paraTurningToolsList(Page<ParaTurningToolsVo> page,
                                                   @Param(Constants.WRAPPER) Wrapper<ParaTurningToolsVo> queryWrapper);

    IPage<ParaBladeVo> paraBladeList(Page<ParaBladeVo> page,
                                               @Param(Constants.WRAPPER) Wrapper<ParaBladeVo> queryWrapper);

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ToolsConfigPropertyMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.tms.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ToolsConfigProperty;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: tms_tools_config_property
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
public interface ToolsConfigPropertyMapper extends BaseMapper<ToolsConfigProperty> {

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/BaseToolsMapper.xml

@@ -1,5 +1,346 @@
<?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="org.jeecg.modules.tms.mapper.BaseToolsMapper">

    <select id="paraHolesToolsList" resultType="org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo">
        select
            t.id,
            t.classify_id classifyId,
            t.tool_code toolCode,
            t.sign_code signCode,
            t.chinese_name chineseName,
            t.foreign_language_name foreignLanguageName,
            t.standard_level standardLevel,
            t.standard_code standardCode,
            t.tool_model toolModel,
            t.parama_table_name paramaTableName,
            t1.application_type applicationType,
            t1.supplier_id supplierId,
            t1.province_city provinceCity,
            t1.position_code positionCode,
            t1.storage_location storageLocation,
            t1.main_unit mainUnit,
            t1.auxiliary_unit auxiliaryUnit,
            t1.auxiliary_unit_flag auxiliaryUnitFlag,
            t1.price,
            t1.lower_inventory lowerInventory,
            t1.highest_inventory highestInventory,
            t2.diameter,
            t2.cone_angle coneAngle,
            t2.edge_length edgeLength,
            t2.total_length totalLength,
            t2.tool_material toolMaterial,
            t2.part_material partMaterial,
            t2.paintcoat_flag paintcoatFlag,
            t2.tool_pattern toolPattern,
            t2.handle_specifications handleSpecifications,
            t2.cooling_method coolingMethod,
            t2.technical_conditions technicalConditions,
            t2.conditions_info conditionsInfo,
            t2.brand,
            t2.types,
            t2.tolerance_class toleranceClass,
            t2.flute_form fluteForm,
            t2.handle_form handleForm,
            t2.blade_count bladeCount,
            t2.small_diameter smallDiameter,
            t2.chamfer_angle chamferAngle,
            t2.fitter_part fitterPart,
            t2.effective_length effectiveLength,
            t2.drill_diameter_range drillDiameterRange,
            t2.knife_diameter knifeDiameter,
            t2.bore_diameter boreDiameter,
            t2.connector_type connectorType,
            t2.slot_specification slotSpecification,
            t2.scope_of_application scopeOfApplication,
            t2.latest_boring_diameter latestBoringDiameter,
            t2.max_boring_diameter maxBoringDiameter,
            t2.processingmethod processingmethod,
            t2.heads_number headsNumber,
            t2.adapt_holder adaptHolder,
            t2.remark,
            t3.classify_id classifyNum,
            t3.type_name classifyName
            from tms_base_tools t
        left join tms_tools_config_property t1 on t1.tool_code = t.id
        left join tms_para_hole_tools t2 on t2.tool_code = t.id
        left join tms_tools_classify t3 on t3.id = t.classify_id
        ${ew.customSqlSegment}
    </select>
    <select id="paraCommonToolList" resultType="org.jeecg.modules.tms.entity.vo.ParaCommonToolVo">
    select
    t.id,
    t.classify_id classifyId,
    t.tool_code toolCode,
    t.sign_code signCode,
    t.chinese_name chineseName,
    t.foreign_language_name foreignLanguageName,
    t.standard_level standardLevel,
    t.standard_code standardCode,
    t.tool_model toolModel,
    t.parama_table_name paramaTableName,
    t1.application_type applicationType,
    t1.supplier_id supplierId,
    t1.province_city provinceCity,
    t1.position_code positionCode,
    t1.storage_location storageLocation,
    t1.main_unit mainUnit,
    t1.auxiliary_unit auxiliaryUnit,
    t1.auxiliary_unit_flag auxiliaryUnitFlag,
    t1.price,
    t1.lower_inventory lowerInventory,
    t1.highest_inventory highestInventory,
    t3.classify_id classifyNum,
    t3.type_name classifyName
    from tms_base_tools t
    left join tms_tools_config_property t1 on t1.tool_code = t.id
    left join tms_tools_classify t3 on t3.id = t.classify_id
    ${ew.customSqlSegment}
</select>
    <select id="paraThreadingToolList" resultType="org.jeecg.modules.tms.entity.vo.ParaThreadingToolVo">
        SELECT
            t.id,
            t.classify_id classifyId,
            t.tool_code toolCode,
            t.sign_code signCode,
            t.chinese_name chineseName,
            t.foreign_language_name foreignLanguageName,
            t.standard_level standardLevel,
            t.standard_code standardCode,
            t.tool_model toolModel,
            t.parama_table_name paramaTableName,
            t1.application_type applicationType,
            t1.supplier_id supplierId,
            t1.province_city provinceCity,
            t1.position_code positionCode,
            t1.storage_location storageLocation,
            t1.main_unit mainUnit,
            t1.auxiliary_unit auxiliaryUnit,
            t1.auxiliary_unit_flag auxiliaryUnitFlag,
            t1.price,
            t1.lower_inventory lowerInventory,
            t1.highest_inventory highestInventory,
            t1.remark,
            t2.thread_code threadCode,
            t2.pitch,
            t2.rotation_direction rotationDirection,
            t2.tolerancezone_level tolerancezoneLevel,
            t2.edge_length edgeLength,
            t2.total_length totalLength,
            t2.tool_material toolMaterial,
            t2.part_material partMaterial,
            t2.paintcoat_flag paintcoatFlag,
            t2.external_dimensions externalDimensions,
            t2.handle_specifications handleSpecifications,
            t2.technical_conditions technicalConditions,
            t2.conditions_info conditionsInfo,
            t2.brand,
            t2.types,
            t2.screw_hole_type screwHoleType,
            t2.cooling_method coolingMethod,
            t2.thread_standard threadStandard,
            t2.flute_solt_type fluteSoltType,
            t2.guiding_size guidingSize,
            t2.thread_type threadType,
            t2.connection_aperture connectionAperture,
            t2.connecting_keyway connectingKeyway,
            t3.classify_id classifyNum,
            t3.type_name classifyName
        FROM
            tms_base_tools t
                LEFT JOIN tms_tools_config_property t1 ON t1.tool_code = t.id
                LEFT JOIN tms_para_threading_tool t2 ON t2.tool_code = t.id
                LEFT JOIN tms_tools_classify t3 ON t3.id = t.classify_id
            ${ew.customSqlSegment}
    </select>
    <select id="paraMillToolList" resultType="org.jeecg.modules.tms.entity.vo.ParaMillToolVo">
        SELECT
            t.id,
            t.classify_id classifyId,
            t.tool_code toolCode,
            t.sign_code signCode,
            t.chinese_name chineseName,
            t.foreign_language_name foreignLanguageName,
            t.standard_level standardLevel,
            t.standard_code standardCode,
            t.tool_model toolModel,
            t.parama_table_name paramaTableName,
            t1.application_type applicationType,
            t1.supplier_id supplierId,
            t1.province_city provinceCity,
            t1.position_code positionCode,
            t1.storage_location storageLocation,
            t1.main_unit mainUnit,
            t1.auxiliary_unit auxiliaryUnit,
            t1.auxiliary_unit_flag auxiliaryUnitFlag,
            t1.price,
            t1.lower_inventory lowerInventory,
            t1.highest_inventory highestInventory,
            t2.diameter,
            t2.nose_angle_r noseAngleR,
            t2.number_of_teeth numberOfTeeth,
            t2.edge_length edgeLength,
            t2.total_length totalLength,
            t2.tool_material toolMaterial,
            t2.part_material partMaterial,
            t2.paintcoat_flag paintcoatFlag,
            t2.tool_pattern toolPattern,
            t2.clamping_specifications clampingSpecifications,
            t2.cooling_method coolingMethod,
            t2.technical_conditions technicalConditions,
            t2.conditions_info conditionsInfo,
            t2.brand,
            t2.neck_diameter neckDiameter,
            t2.handle_form handleForm,
            t2.nose_angle_c noseAngleC,
            t2.angle_inside_r angleInsideR,
            t2.small_diameter smallDiameter,
            t2.tool_angle toolAngle,
            t2.handle_length handleLength,
            t2.main_angle_k mainAngleK,
            t2.deepest_depth deepestDepth,
            t2.adapt_blade adaptBlade,
            t2.handle_neck_form handleNeckForm,
            t2.handle_neck_length handleNeckLength,
            t2.size_specifications sizeSpecifications,
            t2.milling_head_form millingHeadForm,
            t2.overhanging_length overhangingLength,
            t2.cutting_edge_form cuttingEdgeForm,
            t2.number_patterns numberPatterns,
            t2.pitch,
            t2.recently_diameter recentlyDiameter,
            t3.classify_id classifyNum,
            t3.type_name classifyName
        FROM
            tms_base_tools t
                LEFT JOIN tms_tools_config_property t1 ON t1.tool_code = t.id
                LEFT JOIN tms_para_mill_tool t2 ON t2.tool_code = t.id
                LEFT JOIN tms_tools_classify t3 ON t3.id = t.classify_id
            ${ew.customSqlSegment}
    </select>
    <select id="paraTurningToolsList" resultType="org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo">
        SELECT
            t.id,
            t.classify_id classifyId,
            t.tool_code toolCode,
            t.sign_code signCode,
            t.chinese_name chineseName,
            t.foreign_language_name foreignLanguageName,
            t.standard_level standardLevel,
            t.standard_code standardCode,
            t.tool_model toolModel,
            t.parama_table_name paramaTableName,
            t1.application_type applicationType,
            t1.supplier_id supplierId,
            t1.province_city provinceCity,
            t1.position_code positionCode,
            t1.storage_location storageLocation,
            t1.main_unit mainUnit,
            t1.auxiliary_unit auxiliaryUnit,
            t1.auxiliary_unit_flag auxiliaryUnitFlag,
            t1.price,
            t1.lower_inventory lowerInventory,
            t1.highest_inventory highestInventory,
            t2.head_specifications headSpecifications,
            t2.matching_number matchingNumber,
            t2.lead_angle leadAngle,
            t2.cross_sectional_size crossSectionalSize,
            t2.total_length totalLength,
            t2.cutting_direction cuttingDirection,
            t2.tool_material toolMaterial,
            t2.part_material partMaterial,
            t2.tool_pattern toolPattern,
            t2.paintcoat_flag paintcoatFlag,
            t2.technical_conditions technicalConditions,
            t2.conditions_info conditionsInfo,
            t2.brand,
            t2.conditions_info,
            t2.types,
            t2.knife_size knifeSize,
            t2.cooling_method coolingMethod,
            t2.holder_category holderCategory,
            t2.tool_diameter toolDiameter,
            t2.fastening_form fasteningForm,
            t2.boring_bar_diameter boringBarDiameter,
            t2.blade_length bladeLength,
            t2.blade_shape bladeShape,
            t2.blade_posterior bladePosterior,
            t2.bar_direction barDirection,
            t2.blade_height bladeHeight,
            t2.blade_wide bladeWide,
            t2.blade_size bladeSize,
            t2.knife_clip_model knifeClipModel,
            t2.clamping_method clampingMethod,
            t2.slot_width slotWidth,
            t2.small_diameter smallDiameter,
            t2.max_diameter maxDiameter,
            t2.max_depth maxDepth,
            t2.knife_bar_form knifeBarForm,
            t2.blade_thickness bladeThickness,
            t2.min_diameter minDiameter,
            t3.classify_id classifyNum,
            t3.type_name classifyName
        FROM
            tms_base_tools t
                LEFT JOIN tms_tools_config_property t1 ON t1.tool_code = t.id
                LEFT JOIN tms_para_turning_tools t2 ON t2.tool_code = t.id
                LEFT JOIN tms_tools_classify t3 ON t3.id = t.classify_id
            ${ew.customSqlSegment}
    </select>
    <select id="paraBladeList" resultType="org.jeecg.modules.tms.entity.vo.ParaBladeVo">
        SELECT
            t.id,
            t.classify_id classifyId,
            t.tool_code toolCode,
            t.sign_code signCode,
            t.chinese_name chineseName,
            t.foreign_language_name foreignLanguageName,
            t.standard_level standardLevel,
            t.standard_code standardCode,
            t.tool_model toolModel,
            t.parama_table_name paramaTableName,
            t1.application_type applicationType,
            t1.supplier_id supplierId,
            t1.province_city provinceCity,
            t1.position_code positionCode,
            t1.storage_location storageLocation,
            t1.main_unit mainUnit,
            t1.auxiliary_unit auxiliaryUnit,
            t1.auxiliary_unit_flag auxiliaryUnitFlag,
            t1.price,
            t1.lower_inventory lowerInventory,
            t1.highest_inventory highestInventory,
            t1.remark,
            t2.blade_shape bladeShape,
            t2.blade_length bladeLength,
            t2.cutting_edge_count cuttingEdgeCount,
            t2.blade_thickness bladeThickness,
            t2.clamping_type clampingType,
            t2.nose_angle_r noseAngleR,
            t2.tool_material toolMaterial,
            t2.part_material partMaterial,
            t2.paintcoat_flag paintcoatFlag,
            t2.technical_conditions technicalConditions,
            t2.conditions_info conditionsInfo,
            t2.brand,
            t2.types,
            t2.coating_material coatingMaterial,
            t2.processing_classify processingClassify,
            t2.blade_posterior bladePosterior,
            t2.cutting_direction cuttingDirection,
            t2.blade_wide bladeWide,
            t2.blade_size bladeSize,
            t2.in_out_thread inOutThread,
            t2.thread_standard threadStandard,
            t2.dental_angle dentalAngle,
            t2.pitch,
            t2.min_internal_thread minInternalThread,
            t3.classify_id classifyNum,
            t3.type_name classifyName
        FROM
            tms_base_tools t
                LEFT JOIN tms_tools_config_property t1 ON t1.tool_code = t.id
                LEFT JOIN tms_para_blade t2 ON t2.tool_code = t.id
                LEFT JOIN tms_tools_classify t3 ON t3.id = t.classify_id
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsClassifyMapper.xml

@@ -11,6 +11,7 @@
            p.classify_id parentNum,
            p.type_name parentName,
            t.seq,
            t.encoding_type encodingType,
            t.leaf_flag leafFlag,
            t.para_type_flag paraTypeFlag,
            a.paraTypeFlagName paraTypeFlagName,

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ToolsConfigPropertyMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?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="org.jeecg.modules.tms.mapper.ToolsConfigPropertyMapper">

</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IBaseToolsService.java

@@ -1,7 +1,13 @@
package org.jeecg.modules.tms.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.BaseTools;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.ParaBlade;
import org.jeecg.modules.tms.entity.vo.*;

import java.util.Map;

/**
 * @Description: tms_base_tools
@@ -11,4 +17,15 @@
 */
public interface IBaseToolsService extends IService<BaseTools> {

    IPage<ParaHolesToolsVo> paraHolesToolsList(Page<ParaHolesToolsVo> page, Map<String, String[]> parameterMap);

    IPage<ParaCommonToolVo> paraCommonToolList(Page<ParaCommonToolVo> page, Map<String, String[]> parameterMap);

    IPage<ParaThreadingToolVo> paraThreadingToolList(Page<ParaThreadingToolVo> page, Map<String, String[]> parameterMap);

    IPage<ParaMillToolVo> paraMillToolList(Page<ParaMillToolVo> page, Map<String, String[]> parameterMap);

    IPage<ParaTurningToolsVo> paraTurningToolsList(Page<ParaTurningToolsVo> page, Map<String, String[]> parameterMap);

    IPage<ParaBladeVo> paraBladeList(Page<ParaBladeVo> page, Map<String, String[]> parameterMap);
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IToolsConfigPropertyService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.tms.service;

import org.jeecg.modules.tms.entity.ToolsConfigProperty;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @Description: tms_tools_config_property
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
public interface IToolsConfigPropertyService extends IService<ToolsConfigProperty> {

}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/BaseToolsServiceImpl.java

@@ -1,11 +1,19 @@
package org.jeecg.modules.tms.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.BaseTools;
import org.jeecg.modules.tms.entity.ParaCommonTool;
import org.jeecg.modules.tms.entity.vo.*;
import org.jeecg.modules.tms.mapper.BaseToolsMapper;
import org.jeecg.modules.tms.service.IBaseToolsService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.Map;

/**
 * @Description: tms_base_tools
@@ -16,4 +24,117 @@
@Service
public class BaseToolsServiceImpl extends ServiceImpl<BaseToolsMapper, BaseTools> implements IBaseToolsService {

    @Override
    public IPage<ParaHolesToolsVo> paraHolesToolsList(Page<ParaHolesToolsVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaHolesToolsVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraHolesToolsList(page, queryWrapper);
    }

    @Override
    public IPage<ParaCommonToolVo> paraCommonToolList(Page<ParaCommonToolVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaCommonToolVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraCommonToolList(page, queryWrapper);
    }

    @Override
    public IPage<ParaThreadingToolVo> paraThreadingToolList(Page<ParaThreadingToolVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaThreadingToolVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraThreadingToolList(page, queryWrapper);
    }

    @Override
    public IPage<ParaMillToolVo> paraMillToolList(Page<ParaMillToolVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaMillToolVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraMillToolList(page, queryWrapper);
    }

    @Override
    public IPage<ParaTurningToolsVo> paraTurningToolsList(Page<ParaTurningToolsVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaTurningToolsVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraTurningToolsList(page, queryWrapper);
    }

    @Override
    public IPage<ParaBladeVo> paraBladeList(Page<ParaBladeVo> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ParaBladeVo> queryWrapper = Wrappers.query();
        String[] classifyIds = parameterMap.get("classifyId");
        if (classifyIds != null && classifyIds.length > 0) {
            queryWrapper.eq("t.classify_id", classifyIds[0]);
        }
        String[] toolCodes = parameterMap.get("toolCode");
        if (toolCodes != null && toolCodes.length > 0) {
            queryWrapper.like("t.tool_code", toolCodes[0]);
        }
        String[] toolModels = parameterMap.get("toolModel");
        if (toolModels != null && toolModels.length > 0) {
            queryWrapper.like("t.tool_model", toolModels[0]);
        }
        queryWrapper.orderByDesc("t.create_time");
        return this.baseMapper.paraBladeList(page, queryWrapper);
    }
}

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java

@@ -13,16 +13,20 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.ImportExcelUtil;
import org.jeecg.common.util.StrUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.mapper.SysDictItemMapper;
import org.jeecg.modules.system.mapper.SysDictMapper;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.mapper.ToolsClassifyMapper;
import org.jeecg.modules.tms.service.IToolsClassifyService;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

@@ -49,6 +53,12 @@

    @Value("${jeecg.path.upload}")
    private String upLoadPath;

    @Autowired
    private SysDictMapper sysDictMapper;

    @Autowired
    private SysDictItemMapper sysDictItemMapper;
    @Override
    public IPage<ToolsClassify> queryPageList(Page<ToolsClassify> page, Map<String, String[]> parameterMap) {
        QueryWrapper<ToolsClassify> queryWrapper = Wrappers.query();
@@ -188,6 +198,7 @@
            // èŽ·å–第一个工作表
            Sheet sheet = workbook.getSheetAt(0);
            for(Row row : sheet) {
                int rowNum = row.getRowNum()+1;
                ToolsClassify newToolsClassify = new ToolsClassify();
                if (row.getRowNum() == 0)
                    continue;
@@ -197,6 +208,8 @@
                String name = nameCell.getStringCellValue();
                Cell parentNumCell = row.getCell(2);
                String parentNum = parentNumCell.getStringCellValue();
                Cell seqCell = row.getCell(3);
                String seq = seqCell.getStringCellValue();
                Cell leafFlagCell = row.getCell(4);
                String leafFlag = leafFlagCell.getStringCellValue();
                Cell paraTypeFlagCell = row.getCell(5);
@@ -207,47 +220,87 @@
                }else if("否".equals(leafFlag)){
                    leafFlag = "2";
                }else {
                    errorMessage.add("第"+row.getRowNum()+1+"行，是否为叶子节点填写错误，请填写‘是’或’否‘");
                    errorMessage.add("第"+rowNum+"行，是否为叶子节点填写错误，请填写‘是’或’否‘");
                    errorLines++;
                    continue;
                }
                if(StringUtils.isBlank(num)){
                    errorMessage.add("第"+row.getRowNum()+1+"行，分类编码不能为空");
                    errorMessage.add("第"+rowNum+"行，分类编码不能为空");
                    errorLines++;
                    continue;
                }
                if(StringUtils.isBlank(name)){
                    errorMessage.add("第"+row.getRowNum()+1+"行，分类名称不能为空");
                    errorMessage.add("第"+rowNum+"行，分类名称不能为空");
                    errorLines++;
                    continue;
                    //判断是否有上级分类
                }
                //判断参数模板是否存在
                if(StringUtils.isNotBlank(paraTypeFlag)){
                    List<DictModel> dictList = sysDictMapper.queryDictItemValueByCodeAndText("tool_para_type",paraTypeFlag);
                    if(CollectionUtils.isNotEmpty(dictList)){
                        paraTypeFlag = dictList.get(0).getValue();
                    }else {
                        errorMessage.add("第"+rowNum+"行，参数模板不存在");
                        errorLines++;
                        continue;
                    }
                }

                if(StringUtils.isNotBlank(parentNum)){
                    ToolsClassify toolsClassify = this.lambdaQuery()
                            .eq(ToolsClassify::getClassifyId,parentNum)
                            .eq(ToolsClassify::getLeafFlag,"2").one();
                    if(toolsClassify == null){
                        errorMessage.add("第"+row.getRowNum()+1+"行，分类编码为"+num+"的数据的上级分类编号不存在或为叶子节点");
                        errorMessage.add("第"+rowNum+"行，分类编码为"+num+"的数据的上级分类编号不存在或为叶子节点");
                        errorLines++;
                    }else {
                        //判断编码是否重复，重复的进行更新
                        ToolsClassify tools = this.lambdaQuery().eq(ToolsClassify::getClassifyId,num).one();
                        if(tools != null){
                            tools.setClassifyId(num)
                                    .setTypeName(name)
                                    .setStatus("1")
                                    .setLeafFlag(leafFlag)
                                    .setSeq(seq)
                                    .setParentId(toolsClassify.getId())
                                    .setParaTypeFlag(paraTypeFlag);
                            this.updateById(tools);
                    }else {
                        newToolsClassify.setClassifyId(num)
                                .setTypeName(name)
                                .setStatus("1")
                                .setLeafFlag(leafFlag)
                                    .setSeq(seq)
                                .setParentId(toolsClassify.getId())
                                .setParaTypeFlag(paraTypeFlag);
                        this.save(newToolsClassify);
                        }
                        successLines++;
                    }
                    //如果没填写上级分类编号，则新增到根节点
                }else {
                    //判断编码是否重复，重复的进行更新
                    ToolsClassify tools = this.lambdaQuery().eq(ToolsClassify::getClassifyId,num).one();
                    if(tools != null){
                        tools.setClassifyId(num)
                                .setTypeName(name)
                                .setStatus("1")
                                .setLeafFlag(leafFlag)
                                .setSeq(seq)
                                .setParentId("-1")
                                .setParaTypeFlag(paraTypeFlag);
                        this.updateById(tools);
                }else {
                    newToolsClassify.setClassifyId(num)
                            .setTypeName(name)
                            .setStatus("1")
                            .setParentId("-1")
                                .setSeq(seq)
                            .setLeafFlag(leafFlag)
                            .setParaTypeFlag(paraTypeFlag);
                    this.save(newToolsClassify);
                    }
                    successLines++;
                }
            }

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsConfigPropertyServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.tms.service.impl;

import org.jeecg.modules.tms.entity.ToolsConfigProperty;
import org.jeecg.modules.tms.mapper.ToolsConfigPropertyMapper;
import org.jeecg.modules.tms.service.IToolsConfigPropertyService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

/**
 * @Description: tms_tools_config_property
 * @Author: jeecg-boot
 * @Date:   2025-05-13
 * @Version: V1.0
 */
@Service
public class ToolsConfigPropertyServiceImpl extends ServiceImpl<ToolsConfigPropertyMapper, ToolsConfigProperty> implements IToolsConfigPropertyService {

}