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

zhanghl

2025-05-09 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c

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

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

@@ -3,6 +3,7 @@
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanDate;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateStandardRequire;
@@ -28,7 +29,7 @@
    /**
     * 查询钣金工单计划
     */
//    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
    {
@@ -40,7 +41,7 @@
    /**
     * 查询钣金工单需求
     */
//    @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
    @RequiresPermissions("ApsPlatOrderPlanManager:requirement:list")
    @GetMapping("/requirement/list")
    public List<ApsPlateStandardRequire> list(String workOrderNo)
    {
@@ -48,6 +49,7 @@
        return list;
    }

    @RequiresPermissions("ApsPlatOrderPlanManager:planDate:edit")
    @PutMapping("/planDate")
    public AjaxResult list(@RequestBody ApsPlateOrderPlanDate apsPlateOrderPlanDate)
    {

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

@@ -30,7 +30,7 @@

    /** 需求追溯ID */
    @Excel(name = "需求追溯ID")
    private Long requireTraceId;
    private Long requireTrackId;

    /** 工单号 */
    @Excel(name = "工单号")
@@ -94,10 +94,15 @@
    /** 需求计划开工日 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "需求计划开工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date startDay;
    private Date startDate;

    /** 需求计划开完日 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "需求计划开完日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completeDay;
    private Date completeDate;

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

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

@@ -189,6 +189,11 @@
    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderCreateTime;

    /** 自定义时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "自定义时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date customTime;

    /** 生产基地 */
    @Excel(name = "生产基地")
    private String productionBase;

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

@@ -2,6 +2,7 @@

import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -96,6 +97,8 @@
    private BigDecimal unmatchedDemandAmount;

    /** 建议完成日期 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "建议完成日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date suggestedCompletionDate;
    /** 延迟风险标识 */
    private String hasDelayRisk;

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java

@@ -7,6 +7,7 @@
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,9 @@
    @Autowired
    private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;

    @Autowired
    private IApsPlateStandardRequireService apsPlateStandardRequireService;

    /**
     * 查询钣金工单计划管理
     *
@@ -35,23 +39,34 @@
        return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
    }

    /**
     * 查询钣金工单计划标准需求
     *
     * @param workOrderNo 工单号
     * @return
     */
    @Override
    public List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo) {
        return apsPlateOrderPlanManagerMapper.selectApsPlanStandardRequire(workOrderNo);
    }

    /**
     * 批量更新计划时间
     *
     * @param apsPlateOrderPlanDate
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public void updatePlanDate(ApsPlateOrderPlanDate apsPlateOrderPlanDate) {
        if (apsPlateOrderPlanDate.getIsCustom()){
        if (apsPlateOrderPlanDate.getIsCustom()) {
            apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
        }else{
        } else {
            List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
            planRequireDates.forEach(planRequireDate -> {
                planRequireDate.setUpdateBy(SecurityUtils.getUsername());
                apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
            });
        }

//        apsPlateStandardRequireService.generatorPlan();
    }
}

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

@@ -23,6 +23,7 @@
        <result property="hasDelayRisk"    column="has_delay_risk"    />
        <result property="startDate"    column="start_date"    />
        <result property="completeDate"    column="complete_date"    />
        <result property="customTime"    column="custom_time"    />
    </resultMap>

    <select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
@@ -41,12 +42,13 @@
            plan.plan_start_day,
            plan.plan_end_day,
            plan.unmatched_quantity,
            plan.custom_time,
            require.has_delay_risk,
            plan.id,
            require.start_date,
            require.complete_date
        from aps_plate_standard_require_bom_order_detail detail
            left join aps_plate_standard_require require on on detail.require_id = require.id
            left join aps_plate_standard_require require on detail.require_id = require.id
            left join aps_plate_plan plan on detail.doc_no = plan.document_number
        <where>  
            <if test="workOrderNo != null  and workOrderNo != ''"> and detail.doc_no = #{workOrderNo}</if>
@@ -87,7 +89,7 @@
    </resultMap>

    <sql id="selectApsPlateStandardRequireVo">
        select require.id,
        select distinct require.id,
               require.require_track_id,
               require.bom_line_id,
               require.bom_line_code,
@@ -137,7 +139,7 @@
            min(require.start_date) as start_date,
            min(require.complete_date) as end_date
        from aps_plate_standard_require_bom_order_detail detail
            left join aps_plate_standard_require require on on detail.require_id = require.id
            left join aps_plate_standard_require require on detail.require_id = require.id
            left join aps_plate_plan plan on detail.doc_no = plan.document_number
        where plan.id in
        <foreach collection="planIds" item="planId" open="(" separator="," close=")">
@@ -157,7 +159,7 @@

    <update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
        update aps_plate_plan set
          plan_end_day = #{planRequireDate.customDate},
          custom_time = #{planRequireDate.customDate},
          update_by = #{planRequireDate.updateBy},
          update_time = now()
        where id in