liding
2026-04-07 bace339cef323dcecc2ce309fdda6a0e0a530b28
fix:1.发货查询字段 2.质量批号
已修改3个文件
11 ■■■■ 文件已修改
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityInspectMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/sales/ShippingInfoMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -180,4 +180,6 @@
    private String workOrderNo;
    @TableField(exist = false)
    private String purchaseContractNo;
    @TableField(exist = false)
    private String batchNo;
}
src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -11,7 +11,8 @@
                pl.purchase_contract_number as purchase_contract_no
            </when>
            <otherwise>
                pwo.work_order_no
                pwo.work_order_no,
                po.batch_no
            </otherwise>
        </choose>
        FROM
@@ -24,10 +25,11 @@
            <otherwise>
                LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
                LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
                LEFT JOIN product_order po ON pwo.product_order_id = po.id
            </otherwise>
        </choose>
        WHERE
        inspect_type=#{qualityInspect.inspectType}
        inspect_type = #{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
            AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
        </if>
src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -35,6 +35,9 @@
        <if test="req.expressNumber != null and req.expressNumber != ''">
            AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%')
        </if>
        <if test="req.customerName != null and req.customerName != ''">
            AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
        </if>
        order by create_time DESC
    </select>
    <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">