Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-23 0de06ac0a530227080e9b9b4c7560d4e809fed1e

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java

@@ -3,6 +3,7 @@
import com.aps.core.domain.ApsGasPipelineCapacityPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -32,6 +33,23 @@
    public List<ApsGasPipelineCapacityPlan> selectApsGasPipelineCapacityPlanList(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan);

    /**
     * 查询设计产能数据 - 专用于接口二功能
     * 
     * @param processName 工序名称
     * @param year 年份
     * @param month 月份
     * @param major 专业
     * @param orgCode 工厂代码
     * @return 气体管路产能规划集合
     */
    public List<ApsGasPipelineCapacityPlan> selectDesignCapacityForInterface2(
            @Param("processName") String processName,
            @Param("year") String year,
            @Param("month") String month,
            @Param("major") String major,
            @Param("orgCode") String orgCode);

    /**
     * 新增气体管路产能规划
     * 
     * @param apsGasPipelineCapacityPlan 气体管路产能规划