补片流程卡打印将同流程卡号合并打印，返工流程卡添加责任信息，调整流程卡其它备注样式

chenlu

2024-08-19 a7660c90e3f9776f076a80cfa096fdbb5c7c45fd

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

@@ -106,11 +106,11 @@

    <!--    查询流程卡工艺流程-->
    <select id="SelectTechnologicalProcess">
        select ogd.process
        from sd.order_glass_detail as ogd
        where ogd.production_id = LEFT(#{processIdStr}, 11)
          and ogd.technology_number=#{technologyStr}
        limit 1
        select ifnull((select ogd.process
                       from sd.order_glass_detail as ogd
                       where ogd.production_id = LEFT(#{processIdStr}, 11)
                         and ogd.technology_number=#{technologyStr}
                       limit 1),'') as  process

    </select>

@@ -501,7 +501,7 @@
        select rw.reporting_work_id,
               (rw.reporting_work_time) as reporting_work_time,
               o.order_id,
               rw.process_id,
               CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct rwd.technology_number SEPARATOR '')) as process_id,
               o.project,
               o.batch,
               rw.this_process,