流程卡打印、报工层数过多问题修改

chenlu

2025-09-23 62914e8c873328712742f789e5fdea1a1a46c121

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -84,7 +84,7 @@
                   from reporting_work as a
                       left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
                   where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}
                     and  POSITION(b.technology_number in #{technologyStr})
                     and  FIND_IN_SET(b.technology_number , #{technologyStr})
                   ) as rw
        on rw.process_id = fc.process_id
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
@@ -113,7 +113,7 @@
                       left join flow_card as fc on fc.order_id=o.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number
                       where fc.process_id = #{processIdStr}
                         and o.create_order>0
                         and POSITION(fc.technology_number in #{technologyStr})
                         and FIND_IN_SET(fc.technology_number , #{technologyStr})
                       limit 1),'') as  process

    </select>
@@ -166,7 +166,7 @@
                where
                reporting_work.this_process = #{process}
                and a.process_id=#{processIdStr}
                and POSITION(a.technology_number in #{technologyStr})
                and FIND_IN_SET(a.technology_number , #{technologyStr})
                and a.review_status = 1
                group by a.process_id,a.order_sort,a.technology_number
            ) as patch
@@ -177,7 +177,7 @@

        WHERE
            fc.process_id = #{processIdStr}
          AND  POSITION(fc.technology_number in #{technologyStr})
          AND  FIND_IN_SET(fc.technology_number , #{technologyStr})
          AND odpd.process = #{process}
          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
        and o.create_order>0 and fc.quantity - ifnull(fc.termination_quantity,0)>0
@@ -223,7 +223,7 @@
            from sd.order_glass_detail
            where order_id = ogd.order_id
            and order_number = ogd.order_number
            and POSITION(technology_number in #{technologyStr})
            and  FIND_IN_SET(technology_number , #{technologyStr})
            limit 1)
        </if>

@@ -262,7 +262,7 @@
        left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
        where this_process=#{previousProcess} and process_id= #{processIdStr} and a.reviewed_state>=0
        <if test="laminating == ''">
            AND POSITION(b.technology_number in #{technologyStr})
            AND FIND_IN_SET(b.technology_number , #{technologyStr})
        </if>
        GROUP BY b.order_number,b.technology_number
        ) as rws
@@ -272,7 +272,7 @@

        AND odpd.process = #{process}
        <if test="laminating == ''">
            AND POSITION(fc.technology_number in #{technologyStr})
            AND FIND_IN_SET(fc.technology_number , #{technologyStr})
        </if>
        order by fc.order_number
    </select>