Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-12 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java

@@ -52,6 +52,7 @@
        List<ApsGasPipelineCapacityPlan> list = apsGasPipelineCapacityPlanService.selectApsGasPipelineCapacityPlanList(apsGasPipelineCapacityPlan);
        ApsStandardProcess apsStandardProcess = new ApsStandardProcess();
        apsStandardProcess.setMajor(apsGasPipelineCapacityPlan.getMajor());
        apsStandardProcess.setPlant(apsGasPipelineCapacityPlan.getOrgCode());
        List<ApsStandardProcess> processList = apsStandardProcessService.selectApsStandardProcessListAll(apsStandardProcess);
        if(list.isEmpty()){
            for(ApsStandardProcess apsStandardProcessTemp : processList){

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java

@@ -35,6 +35,9 @@
    {
        startPage();
        List<ApsPlateOrderPlanManager> list = iapPlateOrderPlanManagerService.selectApsPlanOrderManager(apsPlateOrderPlanManager);
        list.stream().forEach(item -> {
            item.setRequireNum(iapPlateOrderPlanManagerService.selectApsPlanStandardRequire(item.getWorkOrderNo()).size());
        });
        return getDataTable(list);
    }


 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java

@@ -78,6 +78,20 @@
    @Schema(description = "月产出总数量", type = "BigDecimal")
    private BigDecimal monthProduceAllNum;

    /** 工厂代码 **/
    @Excel(name = "工厂代码")
    @Schema(description = "工厂代码", type = "String")
    private String orgCode;

    public void setOrgCode(String orgCode)
    {
        this.orgCode = orgCode;
    }

    public String getOrgCode() {
        return orgCode;
    }

    public void setId(Long id) 
    {
        this.id = id;

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java

@@ -105,4 +105,6 @@
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    @Excel(name = "自定义日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
//    private Date customTime;

    private Integer requireNum;
}

 aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml

@@ -22,10 +22,11 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="orgCode"    column="org_code"    />
    </resultMap>

    <sql id="selectApsGasPipelineCapacityPlanVo">
        select id, process_name, year, month, major, day_produce_type, day_produce_num, day_produce_unit, personnel_number, day_produce_all_num, days, month_produce_all_num, remark, create_by, create_time, update_by, update_time from aps_gas_pipeline_capacity_plan
        select id, process_name, year, month, major, day_produce_type, day_produce_num, day_produce_unit, personnel_number, day_produce_all_num, days, month_produce_all_num, remark, create_by, create_time, update_by, update_time, org_code from aps_gas_pipeline_capacity_plan
    </sql>

    <select id="selectApsGasPipelineCapacityPlanList" parameterType="ApsGasPipelineCapacityPlan" resultMap="ApsGasPipelineCapacityPlanResult">
@@ -42,6 +43,7 @@
            <if test="dayProduceAllNum != null "> and day_produce_all_num = #{dayProduceAllNum}</if>
            <if test="days != null "> and days = #{days}</if>
            <if test="monthProduceAllNum != null "> and month_produce_all_num = #{monthProduceAllNum}</if>
            <if test="orgCode != null "> and org_code = #{orgCode}</if>
<!--            <if test="major != null and major != ''">-->
<!--                and process_name in (select process_name from aps_standard_process where major=#{major})-->
<!--            </if>-->
@@ -73,6 +75,7 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="orgCode != null">org_code,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -92,6 +95,7 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="orgCode != null">#{orgCode},</if>
         </trim>
    </insert>

@@ -114,6 +118,7 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="orgCode != null">org_code = #{orgCode},</if>
        </trim>
        where id = #{id}
    </update>