From ac8e03a06d463aafcbe810af31e2da5037491a07 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 13 六月 2025 13:10:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java
index 77621b9..2305953 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/dto/ToolQueryParamDto.java
@@ -9,13 +9,23 @@
*/
@Data
public class ToolQueryParamDto {
- /**澶嶅悎鍙傛暟(宸ュ叿绠�绉�/鐩村緞鍙傛暟)锛屼緥濡傦細3E*/
- @ApiModelProperty(value = "澶嶅悎鍙傛暟(宸ュ叿绠�绉�/鐩村緞鍙傛暟)锛屼緥濡傦細3E")
- private String param;
+ /**宸ュ叿绠�绉�*/
+ @ApiModelProperty(value = "宸ュ叿绠�绉�")
+ private String aliasLabel;
+ /**鍒�鍏风洿寰�*/
+ @ApiModelProperty(value = "鍒�鍏风洿寰�")
+ private String diameter;
/**鍒�鍏峰垎绫籌D(涓嶇敤鍓嶇浼狅紝鍚庡彴璁板綍鍙傛暟鐢�)*/
private String classifyId;
- /**鍒�鍏风洿寰�(涓嶇敤鍓嶇浼狅紝鍚庡彴璁板綍鍙傛暟鐢�)*/
- private String diameter;
+ /**宸ュ叿缂栫爜*/
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(tms_base_tool琛╰ool_code瀛楁)")
+ private String toolCode;
+ /**鍨嬪彿/鍥惧彿*/
+ @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
+ private String toolModel;
+ /**涓枃鍚嶇О*/
+ @ApiModelProperty(value = "涓枃鍚嶇О")
+ private String chineseName;
/**鍒�鍏锋�婚暱*/
@ApiModelProperty(value = "鍒�鍏锋�婚暱")
private String totalLength;
@@ -23,7 +33,7 @@
@ApiModelProperty(value = "鍒�鍏锋潗鏂�")
private String toolMaterial;
/**鍒囧墛鍒冮暱*/
- @ApiModelProperty(value = "鍒囧墛鍒冮暱(瀛斿姞宸ュ垁鍏枫�侀摚鍓婂垁鍏�)")
+ @ApiModelProperty(value = "鍒囧墛鍒冮暱(瀛斿姞宸ュ垁鍏枫�侀摚鍓婂垁鍏枫�佽灪绾瑰垁鍏�)")
private String edgeLength;
/**鍒冩暟(瀛斿姞宸ュ垁鍏�)*/
@ApiModelProperty(value = "鍒冩暟(瀛斿姞宸ュ垁鍏�)")
@@ -69,7 +79,7 @@
@ApiModelProperty(value = "鎮几闀垮害(閾ｅ墛鍒�鍏�)")
private String overhangingLength;
/**铻鸿窛*/
- @ApiModelProperty(value = "铻鸿窛(閾ｅ墛鍒�鍏�)")
+ @ApiModelProperty(value = "铻鸿窛(閾ｅ墛鍒�鍏枫�佽灪绾瑰垁鍏枫�佸垁鐗�)")
private String pitch;
/**鏈�灏忓姞宸ョ洿寰�*/
@ApiModelProperty(value = "鏈�灏忓姞宸ョ洿寰�(閾ｅ墛鍒�鍏�)")
@@ -78,7 +88,7 @@
@ApiModelProperty(value = "閰嶅鍒�鐗囧彿(杞﹀墛鍒�鍏�)")
private String matchingNumber;
/**鍒囧墛鏂瑰悜*/
- @ApiModelProperty(value = "鍒囧墛鏂瑰悜(杞﹀墛鍒�鍏�)")
+ @ApiModelProperty(value = "鍒囧墛鏂瑰悜(杞﹀墛鍒�鍏枫�佸垁鐗�)")
private String cuttingDirection;
/**鍒�鐗囧昂瀵�*/
@ApiModelProperty(value = "鍒�鐗囧昂瀵�(杞﹀墛鍒�鍏�)")
@@ -87,7 +97,7 @@
@ApiModelProperty(value = "闀楁潌鐩村緞(杞﹀墛鍒�鍏�)")
private String boringBarDiameter;
/**鍒�鏉嗛暱搴�*/
- @ApiModelProperty(value = "鍒�鏉嗛暱搴�(杞﹀墛鍒�鍏�)")
+ @ApiModelProperty(value = "鍒�鏉嗛暱搴�(杞﹀墛鍒�鍏枫�佸垁鐗�)")
private String bladeLength;
/**鍒�鏉嗘柟鍚�*/
@ApiModelProperty(value = "鍒�鏉嗘柟鍚�(杞﹀墛鍒�鍏�)")
@@ -96,7 +106,7 @@
@ApiModelProperty(value = "鍒�鏉嗛珮搴�(杞﹀墛鍒�鍏�)")
private String bladeHeight;
/**鍒�鏉嗗搴�*/
- @ApiModelProperty(value = "鍒�鏉嗗搴�(杞﹀墛鍒�鍏�)")
+ @ApiModelProperty(value = "鍒�鏉嗗搴�(杞﹀墛鍒�鍏枫�佸垁鐗�)")
private String bladeWide;
/**鍒�鐗囨Ы瀹�*/
@ApiModelProperty(value = "鍒�鐗囨Ы瀹�(杞﹀墛鍒�鍏�)")
@@ -108,9 +118,81 @@
@ApiModelProperty(value = "鏈�澶у垏妲芥繁搴�(杞﹀墛鍒�鍏�)")
private String maxDepth;
/**鍒�鏉垮帤搴�*/
- @ApiModelProperty(value = "鍒�鏉垮帤搴�(杞﹀墛鍒�鍏�)")
+ @ApiModelProperty(value = "鍒�鏉垮帤搴�(杞﹀墛鍒�鍏枫�佸垁鐗囧帤搴�)")
private String bladeThickness;
/**鏈�灏忓姞宸ョ洿寰�*/
@ApiModelProperty(value = "鏈�灏忓姞宸ョ洿寰�(杞﹀墛鍒�鍏�)")
private String minDiameter;
+ /**铻虹汗浠ｅ彿*/
+ @ApiModelProperty(value = "铻虹汗浠ｅ彿(铻虹汗鍒�鍏�)")
+ private String threadCode;
+ /**铻虹汗鏃嬪悜*/
+ @ApiModelProperty(value = "铻虹汗鏃嬪悜(铻虹汗鍒�鍏�)")
+ private String rotationDirection;
+ /**铻虹汗鍏樊甯︿唬鍙�/绮惧害绛夌骇*/
+ @ApiModelProperty(value = "铻虹汗鍏樊甯︿唬鍙�/绮惧害绛夌骇(铻虹汗鍒�鍏�)")
+ private String tolerancezoneLevel;
+ /**澶栧瀷灏哄*/
+ @ApiModelProperty(value = "澶栧瀷灏哄(铻虹汗鍒�鍏�)")
+ private String externalDimensions;
+ /**鏌勯儴瑙勬牸*/
+ @ApiModelProperty(value = "鏌勯儴瑙勬牸(铻虹汗鍒�鍏�)")
+ private String handleSpecifications;
+ /**铻哄瓟绫诲瀷*/
+ @ApiModelProperty(value = "铻哄瓟绫诲瀷(铻虹汗鍒�鍏�)")
+ private String screwHoleType;
+ /**铻虹汗鏍囧噯*/
+ @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 bladeShape;
+ /**鍒囧墛鍒冩暟*/
+ @ApiModelProperty(value = "鍒囧墛鍒冩暟(鍒�鐗�)")
+ private String cuttingEdgeCount;
+ /**澶瑰浐鍨嬪紡*/
+ @ApiModelProperty(value = "澶瑰浐鍨嬪紡(鍒�鐗�)")
+ private String clampingType;
+ /**鍒�灏朢*/
+ @ApiModelProperty(value = "鍒�灏朢(鍒�鐗�)")
+ private String noseAngleR;
+ /**鍔犲伐鍒嗙被*/
+ @ApiModelProperty(value = "鍔犲伐鍒嗙被(鍒�鐗�)")
+ private String processingClassify;
+ /**鍒�鐗囧悗瑙�*/
+ @ApiModelProperty(value = "鍒�鐗囧悗瑙�(鍒�鐗�)")
+ private String bladePosterior;
+ /**鍒�鐗囧昂瀵�*/
+ @ApiModelProperty(value = "鍒�鐗囧昂瀵�(鍒�鐗�)")
+ private String bladeSize;
+ /**鍐呭铻虹汗*/
+ @ApiModelProperty(value = "鍐呭铻虹汗(鍒�鐗�)")
+ private String inOutThread;
+ /**鐗欏瀷瑙掑害*/
+ @ApiModelProperty(value = "鐗欏瀷瑙掑害(鍒�鐗�)")
+ private String dentalAngle;
+ /**鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞*/
+ @ApiModelProperty(value = "鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞(鍒�鐗�)")
+ private String minInternalThread;
+
+ //鍒嗛〉鍙傛暟
+ @ApiModelProperty(value = "椤电爜")
+ private Integer pageNo = 1; // 褰撳墠椤电爜锛岄粯璁ょ涓�椤�
+ @ApiModelProperty(value = "姣忛〉鏁伴噺")
+ private Integer pageSize = 10; // 姣忛〉鏁伴噺锛岄粯璁�10鏉�
}
--
Gitblit v1.9.3