流程卡修改样式，成品便签添加根据编号一键修改，修改流程卡排序方式，添加配置是否查询样品订单

chenlu

2024-08-08 dd05175f7d1eaed08cdbe030124f470f69767b2e

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

@@ -88,6 +88,7 @@
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
        where fc.process_id = #{processIdStr}
          and fc.technology_number = #{technologyStr}
          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
        GROUP BY fc.process_id
    </select>

@@ -166,11 +167,13 @@
        on patch.process_id = fc.process_id
        and patch.order_sort = fc.order_number
        and patch.technology_number = fc.technology_number
        left join sd.`order` as o on o.order_id=od.order_id

        WHERE
            fc.process_id = #{processIdStr}
          AND fc.technology_number = #{technologyStr}
          AND odpd.process = #{process}
          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')
        order by fc.order_number
    </select>