扭矩配置添加进给参数

Lius

2024-01-15 f7d3ebdc86f50be05170263ea8cc755154650d50

扭矩配置添加进给参数

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java

@@ -62,18 +62,18 @@
    private Date torqueDate;

    /**
     * 参数类型
     * 扭矩值
     */
    @Excel(name = "参数类型", width = 15)
    @ApiModelProperty("参数类型")
    private String argumentType;
    @Excel(name = "扭矩值", width = 15)
    @ApiModelProperty("扭矩值")
    private float torqueValue;

    /**
     * 参数值
     * 进给参数
     */
    @Excel(name = "参数值", width = 15)
    @ApiModelProperty("参数值")
    private float torqueValue;
    @Excel(name = "进给参数", width = 15)
    @ApiModelProperty("进给参数")
    private String feedParameter;

    /**
     * 备注

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper">
    <!--根据扭矩值生成主轴运行曲线-->
    <select id="findSpindleRunningCurve" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig">
        select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId} AND mtc.argument_type = '扭矩'
        select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId}
    </select>

    <!--根据车间层级查询扭矩配置列表-->
@@ -25,7 +25,6 @@
                    #{ id }
                </foreach>
            </if>
            AND argument_type = '扭矩'
            ORDER BY torque_date ASC
        </where>
    </select>
@@ -36,7 +35,7 @@
        FROM
            mdc_torque_config
        WHERE
            equipment_id = #{ equipmentId } AND argument_type = '扭矩'
            equipment_id = #{ equipmentId }
        ORDER BY
            torque_date DESC
    </select>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java

@@ -49,7 +49,7 @@
            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
            MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
            torqueConfig.setEquipmentId(equipmentId);
            torqueConfig.setArgumentType(mdcTorqueConfig.getArgumentType());
            torqueConfig.setFeedParameter(mdcTorqueConfig.getFeedParameter());
            torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
            torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
            torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());