huminmin
17 小时以前 a411319227de1415c25c4ff1cfe1fee741bad753
显示料号
已修改2个文件
13 ■■■■■ 文件已修改
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityInspectMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -88,6 +88,13 @@
    private String model;
    /**
     * 物料编码
     */
    @Excel(name = "料号")
    @TableField(exist = false)
    private String materialCode;
    /**
     * 单位
     */
    @Excel(name = "单位")
src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,6 +4,7 @@
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        qi.*,
        pm.material_code as materialCode,
        (qi.quantity - qi.defective_quantity) as qualifiedQuantity,
        <choose>
            <when test="qualityInspect.inspectType == 0">
@@ -15,6 +16,7 @@
        </choose>
        FROM
        quality_inspect qi
        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
        <choose>
            <when test="qualityInspect.inspectType == 0 ">
                LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
@@ -50,8 +52,10 @@
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        *,
        pm.material_code as materialCode,
        (quantity - defective_quantity) as qualifiedQuantity
        FROM quality_inspect
        FROM quality_inspect qi
        LEFT JOIN product_model pm ON qi.product_model_id = pm.id
        where
        inspect_type=#{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">