From a3976574426c68495e41b586280745c092112950 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 17:30:34 +0800
Subject: [PATCH] fix: 工序参数与基础参数表取消关联
---
src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java | 51 ++++-----------------------------------------------
1 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java
index 4b919bc..e3742b2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.production.pojo.ProductProcessParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@@ -21,53 +23,8 @@
* @since 2026/03/14 15:33
*/
@Data
+@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "ProductProcessParamDto瀵硅薄", description = "宸ュ簭缁戝畾鍙傛暟Dto")
-public class ProductProcessParamDto {
+public class ProductProcessParamDto extends ProductProcessParam {
- @ApiModelProperty("涓婚敭ID")
- private Long id;
-
- @ApiModelProperty("鎵�灞炲伐搴廔D (product_process.id)")
- private Long processId;
-
- @ApiModelProperty("鍏宠仈鍩虹鍙傛暟ID (base_param.id)")
- private Long paramId;
-
- @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗗��(鍗曞�兼ā寮忎娇鐢�)")
- private String standardValue;
-
- @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶灏忓��(鍖洪棿妯″紡浣跨敤)")
- private BigDecimal minValue;
-
- @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶澶у��(鍖洪棿妯″紡浣跨敤)")
- private BigDecimal maxValue;
-
- @ApiModelProperty("鍦ㄦ宸ュ簭涓槸鍚﹀繀濉�(0-鍚�, 1-鏄�)")
- private Integer isRequired;
-
- @ApiModelProperty("鎺掑簭鍙�")
- private Integer sort;
-
- @ApiModelProperty("鍙傛暟鍚嶇О")
- private String paramName;
-
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
- private Integer paramType;
-
- @ApiModelProperty("鍙傛暟鏍煎紡")
- private String paramFormat;
-
- @ApiModelProperty("鍊兼ā寮�(1鍗曞�� 2鍖洪棿)")
- private Integer valueMode;
-
- @ApiModelProperty("鍗曚綅")
- private String unit;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
-
- @ApiModelProperty("鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
}
--
Gitblit v1.9.3