Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-22 9da523001f61c6c6e777594c3c95c14d249abad4

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

@@ -1262,7 +1262,8 @@
               dd.breakage_reason,
               dd.responsible_process,
               dd.responsible_team,
               concat('对应我司单号', o.batch)                 AS otherRemarks
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               dd.responsible_personnel
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1343,7 +1344,8 @@
               dd.breakage_reason,
               dd.responsible_process,
               dd.responsible_team,
               concat('对应我司单号', o.batch)                 AS otherRemarks
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               dd.responsible_personnel
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and