From 5194a4ffdb885cb6444ebe26c0e781d3c9054962 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 29 五月 2025 15:52:16 +0800
Subject: [PATCH] 工具管理-DNC刀具查询接口
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java | 4
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java | 4
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java | 87 ++++++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java | 8 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/ToolParaType.java | 31 +++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml | 60 ++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java | 4
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java | 8 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml | 60 ++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java | 8 +
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java | 3
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml | 63 ++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java | 4
15 files changed, 350 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
new file mode 100644
index 0000000..f0597cc
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsToDncController.java
@@ -0,0 +1,87 @@
+package org.jeecg.modules.tms.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import io.swagger.annotations.ApiOperation;
+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.vo.ParaHolesToolsVo;
+import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
+import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
+import org.jeecg.modules.tms.enums.ToolParaType;
+import org.jeecg.modules.tms.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RestController
+@RequestMapping("/tms/toolsToDnc")
+public class ToolsToDncController {
+
+ @Autowired
+ private IToolsClassifyService toolsClassifyService;
+ @Autowired
+ private IParaHoleToolsService paraHoleToolsService;
+ @Autowired
+ private IParaMillToolService paraMillToolService;
+ @Autowired
+ private IParaTurningToolsService paraTurningToolsService;
+
+ /**
+ * 閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)锛屽弬鏁扮ず渚嬶細3E锛�3涓哄伐鍏风洿寰勫弬鏁般�丒涓哄姞宸ヤ腑蹇冨垁鍏风畝绉帮級
+ * @param param
+ * @return
+ */
+ @ApiOperation(value = "閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)", notes = "閫氳繃宸ュ叿绠�绉�/鐩村緞鍙傛暟鏌ヨ鍏蜂綋宸ュ叿鍙傛暟淇℃伅(缁橠NC鎻愪緵鎺ュ彛)")
+ @GetMapping("/queryToolByParam")
+ public Result<?> queryToolByParam(@RequestParam("param") String param){
+ // 姝ｅ垯琛ㄨ揪寮忥細鍓嶅崐閮ㄥ垎涓烘暟瀛楋紙鏀寔灏忔暟锛夛紝鍚庡崐閮ㄥ垎涓哄ぇ鍐欐垨灏忓啓瀛楁瘝
+ String regex = "^([\\d.]+)([A-Za-z]+)$";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(param);
+ if (matcher.find()) {
+ String diameter = matcher.group(1);
+ String toolAliasName = matcher.group(2);
+
+ List<ToolsClassify> classifyList = toolsClassifyService.list(new LambdaQueryWrapper<ToolsClassify>()
+ .eq(ToolsClassify::getAliasLabel, toolAliasName)
+ .eq(ToolsClassify::getStatus, CommonConstant.STATUS_1));
+ if (CollectionUtil.isEmpty(classifyList)) {
+ return Result.error("鏈壘鍒板尮閰嶇殑宸ュ叿鍒嗙被");
+ }
+ List<Object> toolList = CollectionUtil.newArrayList();
+ for (ToolsClassify classify : classifyList) {
+ String paraTypeFlag = classify.getParaTypeFlag();
+ ToolParaType toolParaType = ToolParaType.fromValue(paraTypeFlag);
+ if (toolParaType != null) {
+ switch (toolParaType) {
+ case HOLE:
+ List<ParaHolesToolsVo> paraHoleToolsList = paraHoleToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ toolList.addAll(paraHoleToolsList);
+ break;
+ case MILL:
+ List<ParaMillToolVo> paraMillToolList = paraMillToolService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ toolList.addAll(paraMillToolList);
+ break;
+ case TURNING:
+ List<ParaTurningToolsVo> paraTurningToolsList = paraTurningToolsService.selectByClassifyAndDiameter(classify.getId(), diameter);
+ toolList.addAll(paraTurningToolsList);
+ break;
+ default:
+ }
+ }
+ }
+ return Result.OK(toolList);
+ } else {
+ return Result.error("鍙傛暟鏍煎紡涓嶆纭�");
+ }
+ }
+
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
index 1f5ea59..4c2215e 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsClassify.java
@@ -78,6 +78,10 @@
@Dict(dicCode = "tool_para_type")
private String paraTypeFlag;
+ /**鍔犲伐涓績鍒�鍏风畝绉�*/
+ @ApiModelProperty(value = "鍔犲伐涓績鍒�鍏风畝绉�")
+ private String aliasLabel;
+
@ApiModelProperty(value = "宸ュ叿鍒嗙被缂栫爜鏂瑰紡")
private String encodingType;
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/ToolParaType.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/ToolParaType.java
new file mode 100644
index 0000000..4b14b38
--- /dev/null
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/enums/ToolParaType.java
@@ -0,0 +1,31 @@
+package org.jeecg.modules.tms.enums;
+
+import lombok.Getter;
+
+/**
+ * 宸ュ叿鍙傛暟绫诲瀷鏋氫妇
+ */
+@Getter
+public enum ToolParaType {
+ GENERAL("1"),//閫氱敤鍙傛暟鏍囪瘑
+ HOLE("2"),//瀛斿姞宸ュ垁鍏峰弬鏁版爣璇�
+ THREADING("3"),//铻虹汗鍒�鍏峰弬鏁版爣璇�
+ MILL("4"),//閾ｅ墛鍒�鍏峰弬鏁版爣璇�
+ TURNING("5"),//杞﹀墛鍒�鍏峰弬鏁版爣璇�
+ BLADE("6");//鍒�鐗囧弬鏁版爣璇�
+
+ private final String value;
+
+ private ToolParaType(String value) {
+ this.value = value;
+ }
+
+ public static ToolParaType fromValue(String value) {
+ for (ToolParaType type : ToolParaType.values()) {
+ if (type.value.equals(value)) {
+ return type;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java
index da66c2e..f77fe90 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaHoleToolsMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaHoleTools;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
/**
* @Description: tms_para_hole_tools
@@ -14,4 +15,6 @@
*/
public interface ParaHoleToolsMapper extends BaseMapper<ParaHoleTools> {
+ List<ParaHolesToolsVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
+ @Param("diameter") String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java
index 402e236..cfbc4c4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaMillToolMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaMillTool;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
/**
* @Description: tms_para_mill_tool
@@ -14,4 +15,6 @@
*/
public interface ParaMillToolMapper extends BaseMapper<ParaMillTool> {
+ List<ParaMillToolVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
+ @Param("diameter") String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java
index a5617d8..137e748 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/ParaTurningToolsMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.ParaTurningTools;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
/**
* @Description: tms_para_turning_tools
@@ -14,4 +15,6 @@
*/
public interface ParaTurningToolsMapper extends BaseMapper<ParaTurningTools> {
+ List<ParaTurningToolsVo> selectByClassifyAndDiameter(@Param("classifyId") String classifyId,
+ @Param("diameter") String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
index 8e429c0..11de71a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaHoleToolsMapper.xml
@@ -2,4 +2,64 @@
<!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.ParaHoleToolsMapper">
+ <select id="selectByClassifyAndDiameter" resultType="org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo">
+ SELECT
+ t.id,
+ t.classify_id AS classifyId,
+ t2.classify_id AS classifyNum,
+ t2.type_name AS classifyName,
+ t1.id AS toolId,
+ t1.tool_code AS toolCode,
+ t.sign_code AS signCode,
+ t.chinese_name AS chineseName,
+ t.foreign_language_name AS foreignLanguageName,
+ t.standard_level AS standardLevel,
+ t.standard_code AS standardCode,
+ t.position_code AS positionCode,
+ t.tool_model AS toolModel,
+ t.diameter,
+ t.cone_angle AS coneAngle,
+ t.edge_length AS edgeLength,
+ t.total_length AS totalLength,
+ t.tool_material AS toolMaterial,
+ t.part_material AS partMaterial,
+ t.paintcoat_flag AS paintcoatFlag,
+ t.tool_pattern AS toolPattern,
+ t.handle_specifications AS handleSpecifications,
+ t.cooling_method AS coolingMethod,
+ t.technical_conditions AS technicalConditions,
+ t.conditions_info AS conditionsInfo,
+ t.brand,
+ t.types,
+ t.tolerance_class AS toleranceClass,
+ t.flute_form AS fluteForm,
+ t.handle_form AS handleForm,
+ t.blade_count AS bladeCount,
+ t.small_diameter AS smallDiameter,
+ t.chamfer_angle AS chamferAngle,
+ t.fitter_part AS fitterPart,
+ t.effective_length AS effectiveLength,
+ t.drill_diameter_range AS drillDiameterRange,
+ t.knife_diameter AS knifeDiameter,
+ t.bore_diameter AS boreDiameter,
+ t.connector_type AS connectorType,
+ t.slot_specification AS slotSpecification,
+ t.scope_of_application AS scopeOfApplication,
+ t.latest_boring_diameter AS latestBoringDiameter,
+ t.max_boring_diameter AS maxBoringDiameter,
+ t.processingmethod,
+ t.heads_number AS headsNumber,
+ t.adapt_holder AS adaptHolder
+ 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>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
index 72af1c2..9a4f98e 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
@@ -2,4 +2,64 @@
<!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.ParaMillToolMapper">
+ <select id="selectByClassifyAndDiameter" resultType="org.jeecg.modules.tms.entity.vo.ParaMillToolVo">
+ SELECT
+ t.id AS id,
+ t.classify_id AS classifyId,
+ t2.classify_id AS classifyNum,
+ t2.type_name AS classifyName,
+ t1.id AS toolId,
+ t.tool_code AS toolCode,
+ t.sign_code AS signCode,
+ t.chinese_name AS chineseName,
+ t.foreign_language_name AS foreignLanguageName,
+ t.standard_level AS standardLevel,
+ t.standard_code AS standardCode,
+ t.position_code AS positionCode,
+ t.tool_model AS toolModel,
+ t.diameter AS diameter,
+ t.nose_angle_r AS noseAngleR,
+ t.number_of_teeth AS numberOfTeeth,
+ t.edge_length AS edgeLength,
+ t.total_length AS totalLength,
+ t.tool_material AS toolMaterial,
+ t.part_material AS partMaterial,
+ t.paintcoat_flag AS paintcoatFlag,
+ t.tool_pattern AS toolPattern,
+ t.clamping_specifications AS clampingSpecifications,
+ t.cooling_method AS coolingMethod,
+ t.technical_conditions AS technicalConditions,
+ t.conditions_info AS conditionsInfo,
+ t.brand AS brand,
+ t.neck_diameter AS neckDiameter,
+ t.handle_form AS handleForm,
+ t.nose_angle_c AS noseAngleC,
+ t.angle_inside_r AS angleInsideR,
+ t.small_diameter AS smallDiameter,
+ t.tool_angle AS toolAngle,
+ t.handle_length AS handleLength,
+ t.main_angle_k AS mainAngleK,
+ t.deepest_depth AS deepestDepth,
+ t.adapt_blade AS adaptBlade,
+ t.handle_neck_form AS handleNeckForm,
+ t.handle_neck_length AS handleNeckLength,
+ t.size_specifications AS sizeSpecifications,
+ t.milling_head_form AS millingHeadForm,
+ t.overhanging_length AS overhangingLength,
+ t.cutting_edge_form AS cuttingEdgeForm,
+ t.number_patterns AS numberPatterns,
+ t.pitch AS pitch,
+ t.recently_diameter AS recentlyDiameter
+ 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>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml
index 05419d2..29827a6 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml
@@ -2,4 +2,67 @@
<!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.ParaTurningToolsMapper">
+ <select id="selectByClassifyAndDiameter" resultType="org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo">
+ SELECT
+ t.id AS id,
+ t.classify_id AS classifyId,
+ t2.classify_id AS classifyNum,
+ t2.type_name AS classifyName,
+ t1.id AS toolId,
+ t1.tool_code AS toolCode,
+ t.sign_code AS signCode,
+ t.chinese_name AS chineseName,
+ t.foreign_language_name AS foreignLanguageName,
+ t.standard_level AS standardLevel,
+ t.standard_code AS standardCode,
+ t.position_code AS positionCode,
+ t.tool_model AS toolModel,
+ t.head_specifications AS headSpecifications,
+ t.matching_number AS matchingNumber,
+ t.lead_angle AS leadAngle,
+ t.cross_sectional_size AS crossSectionalSize,
+ t.total_length AS totalLength,
+ t.cutting_direction AS cuttingDirection,
+ t.tool_material AS toolMaterial,
+ t.part_material AS partMaterial,
+ t.tool_pattern AS toolPattern,
+ t.paintcoat_flag AS paintcoatFlag,
+ t.technical_conditions AS technicalConditions,
+ t.conditions_info AS conditionsInfo,
+ t.brand AS brand,
+ t.types AS types,
+ t.knife_size AS knifeSize,
+ t.cooling_method AS coolingMethod,
+ t.holder_category AS holderCategory,
+ t.tool_diameter AS toolDiameter,
+ t.fastening_form AS fasteningForm,
+ t.boring_bar_diameter AS boringBarDiameter,
+ t.blade_length AS bladeLength,
+ t.blade_shape AS bladeShape,
+ t.blade_posterior AS bladePosterior,
+ t.bar_direction AS barDirection,
+ t.blade_height AS bladeHeight,
+ t.blade_wide AS bladeWide,
+ t.blade_size AS bladeSize,
+ t.knife_clip_model AS knifeClipModel,
+ t.clamping_method AS clampingMethod,
+ t.slot_width AS slotWidth,
+ t.small_diameter AS smallDiameter,
+ t.max_diameter AS maxDiameter,
+ t.max_depth AS maxDepth,
+ t.knife_bar_form AS knifeBarForm,
+ t.blade_thickness AS bladeThickness,
+ t.min_diameter AS minDiameter
+ 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>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java
index 2d89baf..41ad1f1 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaHoleToolsService.java
@@ -2,6 +2,9 @@
import org.jeecg.modules.tms.entity.ParaHoleTools;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
+
+import java.util.List;
/**
* @Description: tms_para_hole_tools
@@ -11,4 +14,5 @@
*/
public interface IParaHoleToolsService extends IService<ParaHoleTools> {
+ List<ParaHolesToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java
index 4acb9f7..1e8b44e 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaMillToolService.java
@@ -2,6 +2,9 @@
import org.jeecg.modules.tms.entity.ParaMillTool;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
+
+import java.util.List;
/**
* @Description: tms_para_mill_tool
@@ -11,4 +14,5 @@
*/
public interface IParaMillToolService extends IService<ParaMillTool> {
+ List<ParaMillToolVo> selectByClassifyAndDiameter(String classifyId, String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java
index d1d1cc0..cbd883b 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IParaTurningToolsService.java
@@ -2,6 +2,9 @@
import org.jeecg.modules.tms.entity.ParaTurningTools;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
+
+import java.util.List;
/**
* @Description: tms_para_turning_tools
@@ -11,4 +14,5 @@
*/
public interface IParaTurningToolsService extends IService<ParaTurningTools> {
+ List<ParaTurningToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java
index f982526..be20fe0 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaHoleToolsServiceImpl.java
@@ -1,11 +1,15 @@
package org.jeecg.modules.tms.service.impl;
import org.jeecg.modules.tms.entity.ParaHoleTools;
+import org.jeecg.modules.tms.entity.vo.ParaHolesToolsVo;
import org.jeecg.modules.tms.mapper.ParaHoleToolsMapper;
import org.jeecg.modules.tms.service.IParaHoleToolsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.Collections;
+import java.util.List;
/**
* @Description: tms_para_hole_tools
@@ -16,4 +20,8 @@
@Service
public class ParaHoleToolsServiceImpl extends ServiceImpl<ParaHoleToolsMapper, ParaHoleTools> implements IParaHoleToolsService {
+ @Override
+ public List<ParaHolesToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
+ return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
+ }
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java
index 28bcf41..61b4899 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaMillToolServiceImpl.java
@@ -1,11 +1,15 @@
package org.jeecg.modules.tms.service.impl;
import org.jeecg.modules.tms.entity.ParaMillTool;
+import org.jeecg.modules.tms.entity.vo.ParaMillToolVo;
import org.jeecg.modules.tms.mapper.ParaMillToolMapper;
import org.jeecg.modules.tms.service.IParaMillToolService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.Collections;
+import java.util.List;
/**
* @Description: tms_para_mill_tool
@@ -16,4 +20,8 @@
@Service
public class ParaMillToolServiceImpl extends ServiceImpl<ParaMillToolMapper, ParaMillTool> implements IParaMillToolService {
+ @Override
+ public List<ParaMillToolVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
+ return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
+ }
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java
index fe04ff8..c9ab2b1 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ParaTurningToolsServiceImpl.java
@@ -1,11 +1,15 @@
package org.jeecg.modules.tms.service.impl;
import org.jeecg.modules.tms.entity.ParaTurningTools;
+import org.jeecg.modules.tms.entity.vo.ParaTurningToolsVo;
import org.jeecg.modules.tms.mapper.ParaTurningToolsMapper;
import org.jeecg.modules.tms.service.IParaTurningToolsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.Collections;
+import java.util.List;
/**
* @Description: tms_para_turning_tools
@@ -16,4 +20,8 @@
@Service
public class ParaTurningToolsServiceImpl extends ServiceImpl<ParaTurningToolsMapper, ParaTurningTools> implements IParaTurningToolsService {
+ @Override
+ public List<ParaTurningToolsVo> selectByClassifyAndDiameter(String classifyId, String diameter) {
+ return this.baseMapper.selectByClassifyAndDiameter(classifyId, diameter);
+ }
}
--
Gitblit v1.9.3