次破报表添加报工审核状态条件

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>

@@ -1433,6 +1436,7 @@
        rw.reviewed,
        rw.examine_time,
        rw.device_name,
        --         GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
        CASE
        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
        ELSE MAX( ogd.glass_child )
@@ -1444,9 +1448,9 @@
        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number
        left join sd.`order` as o on o.order_id=od.order_id
        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0
        and date(rw.reporting_work_time) >= #{date[0]}
        and date(rw.reporting_work_time) &lt;= #{date[1]}
        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
        rw.reporting_work_time >= #{date[0]}
        AND rw.reporting_work_time &lt;  #{date[1]}
        and position(#{process} in rw.this_process)
        <choose>
            <when test="laminating == ''">