统一需求追溯ID requireTrackId

zhanghl

2025-05-08 2ea0bf5d81f21edc01d9580e3535981f43211b37

统一需求追溯ID requireTrackId

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

@@ -27,7 +27,7 @@

    /** 需求追溯ID */
    @Excel(name = "需求追溯ID")
    private String requireId;
    private String requireTrackId;
    /**单号*/
    private String docNum;


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

@@ -28,7 +28,7 @@

    /** 需求ID */
    @Excel(name = "需求ID")
    private String requireId;
    private Long requireId;

    /** 需求追溯ID */
    @Excel(name = "需求追溯ID")

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

@@ -29,7 +29,7 @@

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

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

@@ -33,7 +33,7 @@
    /** 需求Id号 */
    @Excel(name = "需求Id号")
    @Schema(description = "需求Id号")
    private String requireId;
    private Long requireId;

    /** 工单号 */
    @Excel(name = "工单号")

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java

@@ -64,5 +64,5 @@
     */
    public int deleteApsPlateStandardRequireBomStockDetailById(Long id);

    void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId);
    void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId);
}

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

@@ -108,8 +108,8 @@
        /* 记录工单与净需求的匹配关系*/
        ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
                .id(IdUtil.getSnowflakeNextId())
                .requireId(require.getId().toString())
                .requireTrackId(require.getRequireId())
                .requireId(require.getId())
                .requireTrackId(require.getRequireTrackId())
                .bomLineId(require.getBomLineId())
                .bomLineCode(require.getBomLineCode())
                .docNo(platePlan.getDocumentNumber())

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

@@ -109,7 +109,7 @@
     * 计算物料剩余库存 并保存物料剩余库存明细。
     * */
    @Override
    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId){
    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
        /*更新物料剩余库存*/
        itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
        /*记录扣减明细*/

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

@@ -203,7 +203,7 @@
        /*构建需求信息*/
        ApsPlateStandardRequire require = new ApsPlateStandardRequire();
        require.setId(IdUtil.getSnowflakeNextId());
        require.setRequireId(plan.getId());
        require.setRequireTrackId(plan.getId());
        require.setBatchNumber(batchNum);
        require.setDocNum(plan.getDocumentNumber());
        require.setOrgCode(plant);
@@ -246,7 +246,7 @@
                    afterStockAmount = remainderStock.subtract(deductionAmount);
                    require.setNetRequirement(BigDecimal.ZERO);
                }
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
            }
        }


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

@@ -165,7 +165,7 @@

    private void saveRequireError(ApsPlateStandardRequire require,String message) {
        ApsPlateStandardRequireError data = ApsPlateStandardRequireError.builder()
                .requireId(require.getRequireId())
                .requireId(require.getId())
                .batchNumber(require.getBatchNumber())
                .docNum(require.getDocNum())
                .itemNum(require.getBomLineCode())

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

@@ -6,7 +6,7 @@
    
    <resultMap type="ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
        <result property="id"    column="id"    />
        <result property="requireId"    column="require_id"    />
        <result property="requireTrackId"    column="require_track_id"    />
        <result property="bomLineId"    column="bom_line_id"    />
        <result property="bomLineCode"    column="bom_line_code"    />
        <result property="bomLineLevel"    column="bom_line_level"    />
@@ -34,13 +34,18 @@
    </resultMap>

    <sql id="selectApsPlateStandardRequireVo">
        select id, require_id, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id, process_route_hours, require_amount, net_requirement, start_date, complete_date, demand_date, org_code, production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require
        select id, require_track_id, bom_line_id, bom_line_code, bom_line_level, bom_use_amount,
               process_route_id, process_route_hours, require_amount, net_requirement, start_date,
               complete_date, demand_date, org_code, production_base, match_state, match_mode,
               unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number,
               del_flag, create_time, create_by, update_by, update_time
        from aps_plate_standard_require
    </sql>

    <select id="selectApsPlateStandardRequireList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
        <include refid="selectApsPlateStandardRequireVo"/>
        <where>  
            <if test="requireId != null  and requireId != ''"> and require_id = #{requireId}</if>
            <if test="requireTrackId != null  and requireTrackId != ''"> and require_track_id = #{requireTrackId}</if>
            <if test="bomLineId != null  and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
            <if test="bomLineCode != null  and bomLineCode != ''"> and bom_line_code = #{bomLineCode}</if>
            <if test="bomLineLevel != null "> and bom_line_level = #{bomLineLevel}</if>
@@ -72,7 +77,7 @@
        insert into aps_plate_standard_require
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="requireId != null">require_id,</if>
            <if test="requireTrackId != null">require_track_id,</if>
            <if test="bomLineId != null">bom_line_id,</if>
            <if test="bomLineCode != null">bom_line_code,</if>
            <if test="bomLineLevel != null">bom_line_level,</if>
@@ -100,7 +105,7 @@
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="requireId != null">#{requireId},</if>
            <if test="requireTrackId != null">#{requireTrackId},</if>
            <if test="bomLineId != null">#{bomLineId},</if>
            <if test="bomLineCode != null">#{bomLineCode},</if>
            <if test="bomLineLevel != null">#{bomLineLevel},</if>
@@ -131,7 +136,7 @@
    <update id="updateApsPlateStandardRequire" parameterType="ApsPlateStandardRequire">
        update aps_plate_standard_require
        <trim prefix="SET" suffixOverrides=",">
            <if test="requireId != null">require_id = #{requireId},</if>
            <if test="requireTrackId != null">require_track_id = #{requireTrackId},</if>
            <if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
            <if test="bomLineCode != null">bom_line_code = #{bomLineCode},</if>
            <if test="bomLineLevel != null">bom_line_level = #{bomLineLevel},</if>
@@ -172,15 +177,17 @@
    </delete>

    <select id="selectPlateSupplyGapList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
        select id, require_id, bom_line_code, bom_line_level, match_state, match_mode, unmatched_demand_amount, start_date, complete_date, demand_date, org_code, production_base
        select id, require_track_id, bom_line_code, bom_line_level,
               match_state, match_mode, unmatched_demand_amount, start_date,
               complete_date, demand_date, org_code, production_base
        from aps_plate_standard_require where unmatched_demand_amount>0
        <if test="requireId != null and requireId != ''"> and require_id like '%' || #{requireId} || '%'</if>
        <if test="requireTrackId != null and requireTrackId != ''"> and require_track_id like '%' || #{requireTrackId} || '%'</if>
        <if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
    </select>

    <insert id="batchInsert" parameterType="java.util.List">
        insert into aps_plate_standard_require
        (id, require_id,doc_num,batch_number, org_code, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id,
        (id, require_track_id,doc_num,batch_number, org_code, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id,
         process_route_hours, require_amount, net_requirement, start_date, complete_date, demand_date,
         production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date,
         has_delay_risk, batch_number, del_flag, create_time, create_by)
@@ -188,7 +195,7 @@
        <foreach collection="list" item="item" separator=",">
        (
            #{item.Id},
            #{item.requireId},
            #{item.requireTrackId},
            #{item.docNum},
            #{item.batchNumber},
            #{item.orgCode},