huangjiayang
2025-04-24 a159ad0da1814e8d1898a9d6f03c0bc2adfa92c3
【UPDATE】新增BOM实体属性
已修改2个文件
60 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -6,8 +6,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
 * BOM数据管理对象 aps_bom
@@ -36,6 +36,34 @@
    @Excel(name = "料号")
    private String itemCode;
    /** 图号 */
    @Excel(name = "图号")
    private String drawingNo;
    /** 序号 */
    @Excel(name = "序号")
    private String processNo;
    /** 序号 */
    @Excel(name = "单位")
    private String unit;
    /** 数量 */
    @Excel(name = "数量")
    private BigDecimal num;
    /** 总数量 */
    @Excel(name = "总数量")
    private BigDecimal totalNum;
    /** 准备工时 */
    @Excel(name = "准备工时")
    private BigDecimal preparationTime;
    /** 加工工时 */
    @Excel(name = "加工工时")
    private BigDecimal processingTime;
    /** 物料描述 */
    @Excel(name = "物料描述")
    private String itemName;
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -18,10 +18,17 @@
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="drawingNo"    column="drawing_no"    />
        <result property="processNo"    column="process_no"    />
        <result property="unit"    column="unit"    />
        <result property="num"    column="num"    />
        <result property="totalNum"    column="total_num"    />
        <result property="preparationTime"    column="preparation_time"    />
        <result property="processingTime"    column="processing_time"    />
    </resultMap>
    <sql id="selectApsBomVo">
        select id, bom_id, parent_bom_id, item_code, item_name, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time from aps_bom
        select id, bom_id, parent_bom_id, item_code, item_name, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time, drawing_no, process_no, unit, num, total_num, preparation_time, processing_time from aps_bom
    </sql>
    <select id="selectApsBomList" parameterType="ApsBom" resultMap="ApsBomResult">
@@ -60,6 +67,13 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="drawingNo != null">drawing_no,</if>
            <if test="processNo != null">process_no,</if>
            <if test="unit != null">unit,</if>
            <if test="num != null">num,</if>
            <if test="totalNum != null">total_num,</if>
            <if test="preparationTime != null">preparation_time,</if>
            <if test="processingTime != null">processing_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="bomId != null">#{bomId},</if>
@@ -74,6 +88,13 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="drawingNo != null">#{drawingNo},</if>
            <if test="processNo != null">#{processNo},</if>
            <if test="unit != null">#{unit},</if>
            <if test="num != null">#{num},</if>
            <if test="totalNum != null">#{totalNum},</if>
            <if test="preparationTime != null">#{preparationTime},</if>
            <if test="processingTime != null">#{processingTime},</if>
         </trim>
    </insert>
@@ -92,6 +113,13 @@
            <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="drawingNo != null">drawing_no = #{drawingNo},</if>
            <if test="processNo != null">process_no = #{processNo},</if>
            <if test="unit != null">unit = #{unit},</if>
            <if test="num != null">num = #{num},</if>
            <if test="totalNum != null">total_num = #{totalNum}</if>
            <if test="preparationTime != null">preparation_time = #{preparationTime},</if>
            <if test="processingTime != null">processing_time = #{processingTime},</if>
        </trim>
        where id = #{id}
    </update>