sfd
2025-05-08 a76ff02b1bf5fbcf1d74f54e5d22a6ff6825642e
添加钣金工单管理查询
已添加6个文件
261 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlatOrderPlanManagerController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.aps.core.controller.mainPlan;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
 * é’£é‡‘工单计划管理LineController
 *
 * @author sfd
 * @date 2025-05-08
 */
@RestController
@RequestMapping("/ApsPlatOrderPlanManager")
public class ApsPlatOrderPlanManagerController extends BaseController
{
    @Autowired
    private IApsPlateOrderPlanManagerService iapPlateOrderPlanManagerService;
    /**
     * æŸ¥è¯¢é’£é‡‘工单计划
     */
    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
    {
        startPage();
        List<ApsPlateOrderPlanManager> list = iapPlateOrderPlanManagerService.selectApsPlanOrderManager(apsPlateOrderPlanManager);
        return getDataTable(list);
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
package com.aps.core.domain;
import com.aps.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/**
 * æ ‡å‡†å·¥è‰ºè·¯çº¿Header对象 aps_standard_process_route_header
 *
 * @author zhl
 * &#064;date  2025-05-06
 */
@Data
public class ApsPlateOrderPlanManager
{
    @Serial
    private static final long serialVersionUID = 1L;
    /** éœ€æ±‚ID */
    @Excel(name = "需求ID")
    private String requireId;
    /** éœ€æ±‚追溯ID */
    @Excel(name = "需求追溯ID")
    private String requireTraceId;
    /** å·¥å•号 */
    @Excel(name = "工单号")
    private String workOrderNo;
    /** åŒ¹é…æ•°é‡ */
    @Excel(name = "匹配数量")
    private BigDecimal deductionAmount;
    /** å·¥å•类型 */
    @Excel(name = "工单类型")
    private String workOrderType;
    /** æ–™å· */
    @Excel(name = "料号")
    private String mainPartNumber;
    /** ä¸»ä»¶å›¾å· */
    @Excel(name = "主件图号")
    private String mainPartDrawingNumber;
    /** ä¸»ä»¶å®¢æˆ· */
    @Excel(name = "主件客户")
    private String customer;
    /** ç”Ÿäº§æ•°é‡ */
    @Excel(name = "生产数量")
    private BigDecimal productionQuantity;
    /** é€‚用工厂 */
    @Excel(name = "适用工厂")
    private String applicableFactories;
    /** å»¶è¿Ÿé£Žé™©æ ‡è¯† */
    @Excel(name = "延迟风险标识")
    private String hasDelayRisk;
    /** ç”Ÿäº§åŸºåœ° */
    @Excel(name = "生产基地")
    private String productionBase;
    /** è®¡åˆ’开工日 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "计划开工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date planStartDay;
    /** è®¡åˆ’完工日 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date planEndDay;
    /** æœªåŒ¹é…çš„生产数量*/
    private BigDecimal unmatchedQuantity;
    /** å·¥å•创建时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "工单创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date orderCreateTime;
}
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlateOrderPlanManagerMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
 * é’£é‡‘工单计划管理接口
 *
 * @author sfd
 * @date 2025-05-08
 */
@Mapper
public interface ApsPlateOrderPlanManagerMapper
{
    /**
     * é’£é‡‘工单计划管理
     *
     * @param apsPlateOrderPlanManager é’£é‡‘工单计划管理
     * @return é’£é‡‘工单计划管理
     */
    List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateOrderPlanManagerService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.aps.core.service;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import java.util.List;
/**
 * é’£é‡‘工单计划管理Service接口
 *
 * @author sfd
 * @date 2025-05-08
 */
public interface IApsPlateOrderPlanManagerService
{
    List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager);
}
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.aps.core.service.impl;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.SecurityUtils;
import com.aps.core.domain.ApsPlant;
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.mapper.ApsPlantMapper;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.IApsPlantService;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * é’£é‡‘工单计划管理接口 Service业务层处理
 *
 * @author ruoyi
 * @date 2025-04-14
 */
@Service
public class ApsPlateOrderPlanManagerServiceImpl implements IApsPlateOrderPlanManagerService
{
    @Autowired
    private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;
    /**
     * æŸ¥è¯¢é’£é‡‘工单计划管理
     *
     * @param apsPlateOrderPlanManager é’£é‡‘工单计划管理
     * @return é’£é‡‘工单计划管理
     */
    @Override
    public List<ApsPlateOrderPlanManager> selectApsPlanOrderManager(ApsPlateOrderPlanManager apsPlateOrderPlanManager) {
        return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
    }
}
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
<?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.aps.core.mapper.ApsPlateOrderPlanManagerMapper">
    <resultMap type="ApsPlateOrderPlanManager" id="ApsPlateOrderPlanManagerResult">
        <result property="require_id"    column="requireId"    />
        <result property="requireTrackId"    column="require_track_id"    />
        <result property="docNo"    column="doc_no"    />
        <result property="deductionAmount"    column="deduction_amount"    />
        <result property="workOrderType"    column="work_order_type"    />
        <result property="mainPartNumber"    column="main_part_number"    />
        <result property="mainPartDrawingNumber"    column="main_part_drawing_number"    />
        <result property="customer"    column="customer"    />
        <result property="productionQuantity"    column="production_quantity"    />
        <result property="applicableFactories"    column="applicable_factories"    />
        <result property="productionBase"    column="production_base"    />
        <result property="planStartDay"    column="plan_start_day"    />
        <result property="planEndDay"    column="plan_end_day"    />
        <result property="unmatchedQuantity"    column="unmatched_quantity"    />
        <result property="hasDelayRisk"    column="has_delay_risk"    />
    </resultMap>
    <select id="selectApsPlanOrderManager" parameterType="ApsPlateOrderPlanManager" resultMap="ApsPlateOrderPlanManagerResult">
        select
            detail.require_id,
            detail.require_track_id,
            detail.doc_no,
            detail.deduction_amount,
            plan.professional_affiliation as workOrderType,
            plan.main_part_number as item_number,
            plan.main_part_drawing_number,
            plan.customer,
            plan.production_quantity,
            plan.plant as applicable_factories,
            plan.production_base,
            plan.plan_start_day,
            plan.plan_end_day,
            plan.unmatched_quantity,
            plan.has_risk as has_delay_risk
        from aps_plate_standard_require_bom_order_detail detail
            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>
            <if test="requireId != null  and requireId != ''"> and detail.require_id = #{requireId}</if>
            <if test="mainPartNumber != null  and mainPartNumber != ''"> and plan.main_part_number = #{mainPartNumber}</if>
            <if test="hasDelayRisk != null  and hasDelayRisk != ''"> and plan.has_risk = #{hasDelayRisk}</if>
        </where>
    </select>
</mapper>