cuilei
2025-05-29 d4328b5fac8a01d685a3068f097668132095807d
工具管理-修改DNC刀具查询接口,满足多参数查询需求
已添加1个文件
已修改13个文件
267 ■■■■ 文件已修改
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
@@ -6,6 +6,7 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
@@ -36,12 +37,13 @@
    /**
     * é€šè¿‡å·¥å…·ç®€ç§°/直径参数查询具体工具参数信息(给DNC提供接口),参数示例:3E(3为工具直径参数、E为加工中心刀具简称)
     * @param param
     * @param queryParam
     * @return
     */
    @ApiOperation(value = "通过工具简称/直径参数查询具体工具参数信息(给DNC提供接口)", notes = "通过工具简称/直径参数查询具体工具参数信息(给DNC提供接口)")
    @GetMapping("/queryToolByParam")
    public Result<?> queryToolByParam(@RequestParam("param") String param){
    public Result<?> queryToolByParam(@RequestParam("param") ToolQueryParamDto queryParam){
        String param = queryParam.getParam();
        // æ­£åˆ™è¡¨è¾¾å¼ï¼šå‰åŠéƒ¨åˆ†ä¸ºæ•°å­—(支持小数),后半部分为大写或小写字母
        String regex = "^([\\d.]+)([A-Za-z]+)$";
        Pattern pattern = Pattern.compile(regex);
@@ -59,19 +61,21 @@
            List<Object> toolList = CollectionUtil.newArrayList();
            for (ToolsClassify classify : classifyList) {
                String paraTypeFlag = classify.getParaTypeFlag();
                queryParam.setClassifyId(classify.getId());
                queryParam.setDiameter(diameter);
                ToolParaType toolParaType = ToolParaType.fromValue(paraTypeFlag);
                if (toolParaType != null) {
                    switch (toolParaType) {
                        case HOLE:
                            List<ParaHolesToolsVo> paraHoleToolsList = paraHoleToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
                            List<ParaHolesToolsVo> paraHoleToolsList = paraHoleToolsService.selectByClassifyAndDiameter(queryParam);
                            toolList.addAll(paraHoleToolsList);
                            break;
                        case MILL:
                            List<ParaMillToolVo> paraMillToolList = paraMillToolService.selectByClassifyAndDiameter(classify.getId(), diameter);
                            List<ParaMillToolVo> paraMillToolList = paraMillToolService.selectByClassifyAndDiameter(queryParam);
                            toolList.addAll(paraMillToolList);
                            break;
                        case TURNING:
                            List<ParaTurningToolsVo> paraTurningToolsList = paraTurningToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
                            List<ParaTurningToolsVo> paraTurningToolsList = paraTurningToolsService.selectByClassifyAndDiameter(queryParam);
                            toolList.addAll(paraTurningToolsList);
                            break;
                        default:
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,116 @@
package org.jeecg.modules.tms.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
/***
 * DNC工具查询参数封装
 */
@Data
public class ToolQueryParamDto {
    /**复合参数(工具简称/直径参数),例如:3E*/
    @ApiModelProperty(value = "复合参数(工具简称/直径参数),例如:3E")
    private String param;
    /**刀具分类ID(不用前端传,后台记录参数用)*/
    private String classifyId;
    /**刀具直径(不用前端传,后台记录参数用)*/
    private String diameter;
    /**刀具总长*/
    @ApiModelProperty(value = "刀具总长")
    private String totalLength;
    /**刀具材料*/
    @ApiModelProperty(value = "刀具材料")
    private String toolMaterial;
    /**切削刃长*/
    @ApiModelProperty(value = "切削刃长(孔加工刀具、铣削刀具)")
    private String edgeLength;
    /**刃数(孔加工刀具)*/
    @ApiModelProperty(value = "刃数(孔加工刀具)")
    private String bladeCount;
    /**有效加工长度*/
    @ApiModelProperty(value = "有效加工长度(孔加工刀具)")
    private String effectiveLength;
    /**最小镗孔直径(孔加工刀具)*/
    @ApiModelProperty(value = "最小镗孔直径(孔加工刀具)")
    private String latestBoringDiameter;
    /**最大镗孔直径(孔加工刀具)*/
    @ApiModelProperty(value = "最大镗孔直径(孔加工刀具)")
    private String maxBoringDiameter;
    /**刀杆直径*/
    @ApiModelProperty(value = "刀杆直径(孔加工刀具)")
    private String knifeDiameter;
    /**孔径*/
    @ApiModelProperty(value = "孔径(孔加工刀具)")
    private String boreDiameter;
    /**刀头数*/
    @ApiModelProperty(value = "刀头数(孔加工刀具)")
    private String headsNumber;
    /**齿数*/
    @ApiModelProperty(value = "齿数(铣削刀具)")
    private String numberOfTeeth;
    /**颈径*/
    @ApiModelProperty(value = "颈径(铣削刀具)")
    private String neckDiameter;
    /**最小直径*/
    @Excel(name = "最小直径", width = 15)
    @ApiModelProperty(value = "最小直径(孔加工刀具、铣削刀具、车削刀具)")
    private String smallDiameter;
    /**柄长*/
    @ApiModelProperty(value = "柄长(铣削刀具)")
    private String handleLength;
    /**最大切深*/
    @ApiModelProperty(value = "最大切深(铣削刀具)")
    private String deepestDepth;
    /**柄颈长度*/
    @ApiModelProperty(value = "柄颈长度(铣削刀具)")
    private String handleNeckLength;
    /**悬伸长度*/
    @ApiModelProperty(value = "悬伸长度(铣削刀具)")
    private String overhangingLength;
    /**螺距*/
    @ApiModelProperty(value = "螺距(铣削刀具)")
    private String pitch;
    /**最小加工直径*/
    @ApiModelProperty(value = "最小加工直径(铣削刀具)")
    private String recentlyDiameter;
    /**配套刀片号*/
    @ApiModelProperty(value = "配套刀片号(车削刀具)")
    private String matchingNumber;
    /**切削方向*/
    @ApiModelProperty(value = "切削方向(车削刀具)")
    private String cuttingDirection;
    /**刀片尺寸*/
    @ApiModelProperty(value = "刀片尺寸(车削刀具)")
    private String knifeSize;
    /**镗杆直径*/
    @ApiModelProperty(value = "镗杆直径(车削刀具)")
    private String boringBarDiameter;
    /**刀杆长度*/
    @ApiModelProperty(value = "刀杆长度(车削刀具)")
    private String bladeLength;
    /**刀杆方向*/
    @ApiModelProperty(value = "刀杆方向(车削刀具)")
    private String barDirection;
    /**刀杆高度*/
    @ApiModelProperty(value = "刀杆高度(车削刀具)")
    private String bladeHeight;
    /**刀杆宽度*/
    @ApiModelProperty(value = "刀杆宽度(车削刀具)")
    private String bladeWide;
    /**刀片槽宽*/
    @ApiModelProperty(value = "刀片槽宽(车削刀具)")
    private String slotWidth;
    /**最大切入直径*/
    @ApiModelProperty(value = "最大切入直径(车削刀具)")
    private String maxDiameter;
    /**最大切槽深度*/
    @ApiModelProperty(value = "最大切槽深度(车削刀具)")
    private String maxDepth;
    /**刀板厚度*/
    @ApiModelProperty(value = "刀板厚度(车削刀具)")
    private String bladeThickness;
    /**最小加工直径*/
    @ApiModelProperty(value = "最小加工直径(车削刀具)")
    private String minDiameter;
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,6 +17,6 @@
 */
public interface ParaHoleToolsMapper extends BaseMapper<ParaHoleTools> {
    List<ParaHolesToolsVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
                                                       @Param("diameter") String diameter);
    List<ParaHolesToolsVo> selectByClassifyAndDiameter(@Param(Constants.WRAPPER)
                                                       LambdaQueryWrapper<ParaHolesToolsVo> queryWrapper);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaMillTool;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,6 +17,6 @@
 */
public interface ParaMillToolMapper extends BaseMapper<ParaMillTool> {
    List<ParaMillToolVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
                                                     @Param("diameter") String diameter);
    List<ParaMillToolVo> selectByClassifyAndDiameter(@Param(Constants.WRAPPER)
                                                     LambdaQueryWrapper<ParaMillTool> queryWrapper);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java
@@ -2,6 +2,8 @@
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaTurningTools;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,6 +17,6 @@
 */
public interface ParaTurningToolsMapper extends BaseMapper<ParaTurningTools> {
    List<ParaTurningToolsVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
                                                         @Param("diameter") String diameter);
    List<ParaTurningToolsVo> selectByClassifyAndDiameter(@Param(Constants.WRAPPER)
                                                         LambdaQueryWrapper<ParaTurningTools> queryWrapper);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
@@ -53,13 +53,6 @@
        FROM tms_para_hole_tools t
        LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
        LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
        <where>
            <if test="classifyId != null and classifyId != ''">
                AND t.classify_id = #{classifyId}
            </if>
            <if test="diameter != null and diameter != ''">
                AND t.diameter = #{diameter}
            </if>
        </where>
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
@@ -53,13 +53,6 @@
        FROM tms_para_mill_tool t
        LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
        LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
        <where>
            <if test="classifyId != null and classifyId != ''">
                AND t.classify_id = #{classifyId}
            </if>
            <if test="diameter != null and diameter != ''">
                AND t.diameter = #{diameter}
            </if>
        </where>
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml
@@ -56,13 +56,6 @@
        FROM tms_para_turning_tools t
        LEFT JOIN tms_base_tools t1 ON t.tool_code = t1.id
        LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
        <where>
            <if test="classifyId != null and classifyId != ''">
                AND t.classify_id = #{classifyId}
            </if>
            <if test="diameter != null and diameter != ''">
                AND t.diameter = #{diameter}
            </if>
        </where>
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java
@@ -2,6 +2,7 @@
import org.jeecg.modules.tms.entity.ParaHoleTools;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
import java.util.List;
@@ -14,5 +15,5 @@
 */
public interface IParaHoleToolsService extends IService<ParaHoleTools> {
    List<ParaHolesToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter);
    List<ParaHolesToolsVo> selectByClassifyAndDiameter(ToolQueryParamDto queryParamDto);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java
@@ -2,6 +2,7 @@
import org.jeecg.modules.tms.entity.ParaMillTool;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
import java.util.List;
@@ -14,5 +15,5 @@
 */
public interface IParaMillToolService extends IService<ParaMillTool> {
    List<ParaMillToolVo> selectByClassifyAndDiameter(String classifyId, String diameter);
    List<ParaMillToolVo> selectByClassifyAndDiameter(ToolQueryParamDto queryParamDto);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java
@@ -2,6 +2,7 @@
import org.jeecg.modules.tms.entity.ParaTurningTools;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
import java.util.List;
@@ -14,5 +15,5 @@
 */
public interface IParaTurningToolsService extends IService<ParaTurningTools> {
    List<ParaTurningToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter);
    List<ParaTurningToolsVo> selectByClassifyAndDiameter(ToolQueryParamDto queryParamDto);
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java
@@ -1,6 +1,11 @@
package org.jeecg.modules.tms.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
import org.jeecg.modules.tms.mapper.ParaHoleToolsMapper;
import org.jeecg.modules.tms.service.IParaHoleToolsService;
@@ -21,7 +26,25 @@
public class ParaHoleToolsServiceImpl extends ServiceImpl<ParaHoleToolsMapper, ParaHoleTools> implements IParaHoleToolsService {
    @Override
    public List<ParaHolesToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
        return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
    public List<ParaHolesToolsVo> selectByClassifyAndDiameter(ToolQueryParamDto paramDto) {
        LambdaQueryWrapper<ParaHolesToolsVo> queryWrapper = new LambdaQueryWrapper<>();
        if (paramDto != null) {
            // å­”加工刀具相关参数字段
            queryWrapper
                    .eq(StrUtil.isNotBlank(paramDto.getClassifyId()), ParaHolesToolsVo::getClassifyId, paramDto.getClassifyId())
                    .eq(StrUtil.isNotBlank(paramDto.getDiameter()), ParaHolesToolsVo::getDiameter, paramDto.getDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getTotalLength()), ParaHolesToolsVo::getTotalLength, paramDto.getTotalLength())
                    .eq(StrUtil.isNotBlank(paramDto.getToolMaterial()), ParaHolesToolsVo::getToolMaterial, paramDto.getToolMaterial())
                    .eq(StrUtil.isNotBlank(paramDto.getEdgeLength()), ParaHolesToolsVo::getEdgeLength, paramDto.getEdgeLength())
                    .eq(StrUtil.isNotBlank(paramDto.getBladeCount()), ParaHolesToolsVo::getBladeCount, paramDto.getBladeCount())
                    .eq(StrUtil.isNotBlank(paramDto.getEffectiveLength()), ParaHolesToolsVo::getEffectiveLength, paramDto.getEffectiveLength())
                    .eq(StrUtil.isNotBlank(paramDto.getLatestBoringDiameter()), ParaHolesToolsVo::getLatestBoringDiameter, paramDto.getLatestBoringDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getMaxBoringDiameter()), ParaHolesToolsVo::getMaxBoringDiameter, paramDto.getMaxBoringDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getKnifeDiameter()), ParaHolesToolsVo::getKnifeDiameter, paramDto.getKnifeDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getBoreDiameter()), ParaHolesToolsVo::getBoreDiameter, paramDto.getBoreDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getHeadsNumber()), ParaHolesToolsVo::getHeadsNumber, paramDto.getHeadsNumber())
                    .eq(StrUtil.isNotBlank(paramDto.getSmallDiameter()), ParaHolesToolsVo::getSmallDiameter, paramDto.getSmallDiameter());
        }
        return this.baseMapper.selectByClassifyAndDiameter(queryWrapper);
    }
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java
@@ -1,6 +1,9 @@
package org.jeecg.modules.tms.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.tms.entity.ParaMillTool;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
import org.jeecg.modules.tms.mapper.ParaMillToolMapper;
import org.jeecg.modules.tms.service.IParaMillToolService;
@@ -21,7 +24,26 @@
public class ParaMillToolServiceImpl extends ServiceImpl<ParaMillToolMapper, ParaMillTool> implements IParaMillToolService {
    @Override
    public List<ParaMillToolVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
        return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
    public List<ParaMillToolVo> selectByClassifyAndDiameter(ToolQueryParamDto paramDto) {
        LambdaQueryWrapper<ParaMillTool> queryWrapper = new LambdaQueryWrapper<>();
        if (paramDto != null) {
            //铣削刀具相关参数字段
            queryWrapper
                    .eq(StrUtil.isNotBlank(paramDto.getClassifyId()), ParaMillTool::getClassifyId, paramDto.getClassifyId())
                    .eq(StrUtil.isNotBlank(paramDto.getDiameter()), ParaMillTool::getDiameter, paramDto.getDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getTotalLength()), ParaMillTool::getTotalLength, paramDto.getTotalLength())
                    .eq(StrUtil.isNotBlank(paramDto.getToolMaterial()), ParaMillTool::getToolMaterial, paramDto.getToolMaterial())
                    .eq(StrUtil.isNotBlank(paramDto.getEdgeLength()), ParaMillTool::getEdgeLength, paramDto.getEdgeLength())
                    .eq(StrUtil.isNotBlank(paramDto.getNumberOfTeeth()), ParaMillTool::getNumberOfTeeth, paramDto.getNumberOfTeeth())
                    .eq(StrUtil.isNotBlank(paramDto.getNeckDiameter()), ParaMillTool::getNeckDiameter, paramDto.getNeckDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getSmallDiameter()), ParaMillTool::getSmallDiameter, paramDto.getSmallDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getHandleLength()), ParaMillTool::getHandleLength, paramDto.getHandleLength())
                    .eq(StrUtil.isNotBlank(paramDto.getDeepestDepth()), ParaMillTool::getDeepestDepth, paramDto.getDeepestDepth())
                    .eq(StrUtil.isNotBlank(paramDto.getHandleNeckLength()), ParaMillTool::getHandleNeckLength, paramDto.getHandleNeckLength())
                    .eq(StrUtil.isNotBlank(paramDto.getOverhangingLength()), ParaMillTool::getOverhangingLength, paramDto.getOverhangingLength())
                    .eq(StrUtil.isNotBlank(paramDto.getPitch()), ParaMillTool::getPitch, paramDto.getPitch())
                    .eq(StrUtil.isNotBlank(paramDto.getRecentlyDiameter()), ParaMillTool::getRecentlyDiameter, paramDto.getRecentlyDiameter());
        }
        return this.baseMapper.selectByClassifyAndDiameter(queryWrapper);
    }
}
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java
@@ -1,6 +1,9 @@
package org.jeecg.modules.tms.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.tms.entity.ParaTurningTools;
import org.jeecg.modules.tms.entity.dto.ToolQueryParamDto;
import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
import org.jeecg.modules.tms.mapper.ParaTurningToolsMapper;
import org.jeecg.modules.tms.service.IParaTurningToolsService;
@@ -21,7 +24,30 @@
public class ParaTurningToolsServiceImpl extends ServiceImpl<ParaTurningToolsMapper, ParaTurningTools> implements IParaTurningToolsService {
    @Override
    public List<ParaTurningToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
        return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
    public List<ParaTurningToolsVo> selectByClassifyAndDiameter(ToolQueryParamDto paramDto) {
        LambdaQueryWrapper<ParaTurningTools> queryWrapper = new LambdaQueryWrapper<>();
        if (paramDto != null) {
            //车削刀具相关参数字段
            queryWrapper
                    .eq(StrUtil.isNotBlank(paramDto.getClassifyId()), ParaTurningTools::getClassifyId, paramDto.getClassifyId())
                    .eq(StrUtil.isNotBlank(paramDto.getDiameter()), ParaTurningTools::getToolDiameter, paramDto.getDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getTotalLength()), ParaTurningTools::getTotalLength, paramDto.getTotalLength())
                    .eq(StrUtil.isNotBlank(paramDto.getToolMaterial()), ParaTurningTools::getToolMaterial, paramDto.getToolMaterial())
                    .eq(StrUtil.isNotBlank(paramDto.getSmallDiameter()), ParaTurningTools::getSmallDiameter, paramDto.getSmallDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getCuttingDirection()), ParaTurningTools::getCuttingDirection, paramDto.getCuttingDirection())
                    .eq(StrUtil.isNotBlank(paramDto.getKnifeSize()), ParaTurningTools::getKnifeSize, paramDto.getKnifeSize())
                    .eq(StrUtil.isNotBlank(paramDto.getBoringBarDiameter()), ParaTurningTools::getBoringBarDiameter, paramDto.getBoringBarDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getBladeLength()), ParaTurningTools::getBladeLength, paramDto.getBladeLength())
                    .eq(StrUtil.isNotBlank(paramDto.getBarDirection()), ParaTurningTools::getBarDirection, paramDto.getBarDirection())
                    .eq(StrUtil.isNotBlank(paramDto.getBladeHeight()), ParaTurningTools::getBladeHeight, paramDto.getBladeHeight())
                    .eq(StrUtil.isNotBlank(paramDto.getBladeWide()), ParaTurningTools::getBladeWide, paramDto.getBladeWide())
                    .eq(StrUtil.isNotBlank(paramDto.getSlotWidth()), ParaTurningTools::getSlotWidth, paramDto.getSlotWidth())
                    .eq(StrUtil.isNotBlank(paramDto.getMaxDiameter()), ParaTurningTools::getMaxDiameter, paramDto.getMaxDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getMaxDepth()), ParaTurningTools::getMaxDepth, paramDto.getMaxDepth())
                    .eq(StrUtil.isNotBlank(paramDto.getBladeThickness()), ParaTurningTools::getBladeThickness, paramDto.getBladeThickness())
                    .eq(StrUtil.isNotBlank(paramDto.getMinDiameter()), ParaTurningTools::getMinDiameter, paramDto.getMinDiameter())
                    .eq(StrUtil.isNotBlank(paramDto.getMatchingNumber()), ParaTurningTools::getMatchingNumber, paramDto.getMatchingNumber());
        }
        return this.baseMapper.selectByClassifyAndDiameter(queryWrapper);
    }
}