fix: 工序参数与基础参数表取消关联

gongchunyi

7 小时以前 a3976574426c68495e41b586280745c092112950

fix: 工序参数与基础参数表取消关联

 doc/ÄþÏÄ-ÖÐÊ¢½¨²Ä.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 '备注';

 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("所属工序ID (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;
}

 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("所属工序ID (product_process.id)")
    private Long processId;


 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) {

 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>