blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-18 ef5b4a78ec2201b46cb0c9a59fc2cb036bd13f38 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -92,6 +92,7 @@


        <result column="area" property="area"/>


        <result column="breakage_quantity" property="breakageQuantity"/>


        <result column="project" property="project"/>


        <result column="batch" property="batch"/>


        <result column="process_id" property="processId"/>


        <result column="order_number" property="orderNumber"/>


        <result column="technology_number" property="technologyNumber"/>


@@ -566,6 +567,7 @@


        SELECT


        o.order_id,


        o.project,


        o.batch,


        rw.process_id,


        dd.order_number,


        dd.technology_number,


@@ -594,7 +596,7 @@


        rw.reporting_work_time >= #{selectTime1}


        AND rw.reporting_work_time &lt;  #{selectTime2}




        AND dd.available = 0


        AND dd.available = 0 and rw.reviewed_state>=0


        <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">


            and o.order_id regexp #{damageReportDTO.orderId}


        </if>


@@ -995,6 +997,7 @@


    <select id="exportDamageReportMp">


        SELECT o.order_id,


               o.project,


               o.batch,


               rw.process_id,


               dd.order_number,


               dd.technology_number,


@@ -1018,7 +1021,7 @@


            AND dd.technology_number = ogd.technology_number


        WHERE rw.reporting_work_time >= #{dates[0]}


          and rw.reporting_work_time &lt;= #{dates[1]}


          AND dd.available = 0


          AND dd.available = 0 and rw.reviewed_state>=0


        GROUP BY dd.id


    </select>