From a3976574426c68495e41b586280745c092112950 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 17:30:34 +0800
Subject: [PATCH] fix: 工序参数与基础参数表取消关联
---
doc/宁夏-中盛建材.sql | 13 ++++
src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java | 51 +---------------
src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java | 21 +++++++
src/main/resources/mapper/production/ProductProcessParamMapper.xml | 51 +++++++++--------
src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java | 3 -
5 files changed, 65 insertions(+), 74 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 39cc073..1abe397 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -399,3 +399,16 @@
`update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0),
PRIMARY KEY (`id`)
) COMMENT = '閿�鍞彂璐ф槑缁�(瀹滄惌)';
+
+
+ALTER TABLE product_process_param
+ DROP COLUMN param_id;
+
+ALTER TABLE product_process_param
+ ADD COLUMN `param_key` varchar(100) DEFAULT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
+ ADD COLUMN `param_name` varchar(100) NOT NULL COMMENT '鍙傛暟鍚嶇О',
+ ADD COLUMN `param_type` tinyint NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)',
+ ADD COLUMN `param_format` varchar(255) DEFAULT NULL COMMENT '鍙傛暟鏍煎紡',
+ ADD COLUMN `value_mode` tinyint DEFAULT '1' COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
+ ADD COLUMN `unit` varchar(50) DEFAULT NULL COMMENT '鍗曚綅',
+ ADD COLUMN `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞';
\ No newline at end of file
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;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java
index c7acc12..14900c1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java
@@ -30,6 +30,27 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("鍙傛暟鍞竴鏍囪瘑")
+ private String paramKey;
+
+ @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("澶囨敞")
+ private String remark;
+
@ApiModelProperty("鎵�灞炲伐搴廔D (product_process.id)")
private Long processId;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
index e3244bb..cc56629 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
@@ -28,9 +28,6 @@
@Service
public class ProductProcessParamServiceImpl extends ServiceImpl<ProductProcessParamMapper, ProductProcessParam> implements ProductProcessParamService {
- @Autowired
- private BaseParamService baseParamService;
-
@Override
public List<ProductProcessParamDto> listByProcessId(Long processId) {
if (processId == null) {
diff --git a/src/main/resources/mapper/production/ProductProcessParamMapper.xml b/src/main/resources/mapper/production/ProductProcessParamMapper.xml
index 1ccaeb5..5285ddc 100644
--- a/src/main/resources/mapper/production/ProductProcessParamMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessParamMapper.xml
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<?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="com.ruoyi.production.mapper.ProductProcessParamMapper">
<resultMap id="ProductProcessParamResult" type="com.ruoyi.production.pojo.ProductProcessParam">
<id property="id" column="id"/>
<result property="processId" column="process_id"/>
- <result property="paramId" column="param_id"/>
+ <result property="paramKey" column="param_key"/>
+ <result property="paramName" column="param_name"/>
+ <result property="paramType" column="param_type"/>
+ <result property="paramFormat" column="param_format"/>
+ <result property="valueMode" column="value_mode"/>
+ <result property="unit" column="unit"/>
+ <result property="remark" column="remark"/>
<result property="standardValue" column="standard_value"/>
<result property="minValue" column="min_value"/>
<result property="maxValue" column="max_value"/>
@@ -20,26 +24,25 @@
<select id="selectDtoListByProcessId" resultType="com.ruoyi.production.dto.ProductProcessParamDto"
parameterType="java.lang.Long">
- SELECT ppp.id,
- ppp.process_id,
- ppp.param_id,
- ppp.standard_value,
- ppp.min_value,
- ppp.max_value,
- ppp.is_required,
- ppp.sort,
- ppp.create_time,
- ppp.update_time,
- bp.param_name,
- bp.param_type,
- bp.param_format,
- bp.value_mode,
- bp.unit
- FROM product_process_param ppp
- LEFT JOIN base_param bp ON ppp.param_id = bp.id
- WHERE ppp.process_id = #{processId}
- ORDER BY ppp.sort ASC
+ SELECT id,
+ process_id,
+ param_key,
+ param_name,
+ param_type,
+ param_format,
+ value_mode,
+ unit,
+ remark,
+ standard_value,
+ min_value,
+ max_value,
+ is_required,
+ sort,
+ create_time,
+ update_time
+ FROM product_process_param
+ WHERE process_id = #{processId}
+ ORDER BY sort ASC
</select>
-
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3