feat: 已发货导入新增出厂检验数据

gongchunyi

7 小时以前 9850352a79244c17f9b7343f85f5abd88227a128

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -3,10 +3,40 @@
<mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        qi.*,
        qi.id,
        qi.inspect_type,
        qi.check_time,
        qi.supplier,
        qi.customer,
        qi.process,
        qi.check_name,
        qi.product_id,
        qi.product_name,
        qi.model,
        ifnull(pm.unit, qi.unit) as unit,
        qi.quantity,
        qi.check_company,
        qi.check_result,
        qi.create_time,
        qi.create_user,
        qi.update_time,
        qi.update_user,
        qi.tenant_id,
        qi.inspect_state,
        qi.approval_status,
        qi.approve_user_ids,
        qi.purchase_ledger_id,
        qi.product_main_id,
        qi.defective_phenomena,
        qi.product_model_id,
        qi.test_standard_id,
        <choose>
            <when test="qualityInspect.inspectType == 0">
                pl.purchase_contract_number as purchase_contract_no,
                pm.thickness
            </when>
            <when test="qualityInspect.inspectType == 1">
                pwo.work_order_no,
                pm.thickness
            </when>
            <otherwise>
@@ -47,7 +77,13 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY qi.check_time DESC
        <if test="qualityInspect.approvalStatus != null">
            AND qi.approval_status = #{qualityInspect.approvalStatus}
        </if>
        <if test="qualityInspect.approveUserIds != null and qualityInspect.approveUserIds != '' ">
            AND qi.approve_user_ids like concat('%',#{qualityInspect.approveUserIds},'%')
        </if>
        ORDER BY qi.id DESC
    </select>

    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
@@ -68,6 +104,12 @@
        <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
            AND product_name = #{qualityInspect.productName}
        </if>
        <if test="qualityInspect.approvalStatus != null">
            AND approval_status = #{qualityInspect.approvalStatus}
        </if>
        <if test="qualityInspect.approveUserIds != null and qualityInspect.approveUserIds != '' ">
            AND approve_user_ids like concat('%',#{qualityInspect.approveUserIds},'%')
        </if>
    </select>

    <delete id="deleteByProductMainIds">