blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-24 a04d735ab3f2e9c52ebf52c35dfa1506d86d416d 
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml


@@ -619,7 +619,7 @@


                                   left join sd.basic_data as bd on bd.nickname='stepC'


                                   where ogds.order_id = #{orderId}


                                     and LOCATE(bd.basic_name, ogds.process) > 0


                                   GROUP BY order_id, order_number, ogds.group) as ogdss


                                   GROUP BY order_id, order_number, ogds.group,bd.basic_name) as ogdss


                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number


               where fc.order_id = #{orderId}


               GROUP BY fc.process_id, ogdss.technology_number


@@ -662,7 +662,7 @@


                                                                                  ogds.technology_number


                                            left join sd.basic_data as bd on bd.nickname='stepD'


                                   where ogds.order_id = #{orderId}


                                   GROUP BY order_id, order_number) as ogdss


                                   GROUP BY order_id, order_number,bd.basic_name) as ogdss


                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number


               where fc.order_id = #{orderId}


               GROUP BY fc.process_id


@@ -670,7 +670,7 @@


        where process is not null


          and process != ""


        GROUP BY order_id, process_id, technology_number, process


        order by order_id, process_id, length(technology_number)) as result


        order by order_id, process_id, length(technology_number),technology_number) as result


        LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc


        on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number


    </select>


@@ -678,6 +678,7 @@


    <select id="getPrimaryList">


        select o.customer_name,


               o.project,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               #{process}                                         process,


               od.edging_type,


               #{glassChild}                                   as glass_child,


@@ -718,6 +719,7 @@


    <select id="getPrimaryLists">


        select o.customer_name,


               o.project,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               #{process}                                         process,


               od.edging_type,


               #{glassChild}                                   as glass_child,


@@ -760,7 +762,7 @@


               fc.quantity,


               round(ogd.total_area, 2)                                       as total_area,


               od.perimeter,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,


        if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -817,7 +819,7 @@


               fc.quantity,


               round(ogd.total_area, 2)                                       as total_area,


               od.perimeter,


               if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -1027,7 +1029,7 @@


               ogd.glass_child,


               #{process}                                                           as process,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber,


               if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius


        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


@@ -1246,6 +1248,7 @@


               fc.process_id,


               o.customer_name,


               o.project,


               o.batch,


               fc.order_number,


               ogd.technology_number,


               ogd.glass_address,


@@ -1408,6 +1411,7 @@


    <select id="getPrimaryListMerge">


        select o.customer_name,


               o.project,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               ogd.process,


               od.edging_type,


               ogdc.concatenated_glass_child                   as glass_child,


@@ -1481,7 +1485,8 @@


                                           pl.order_sort = fc.order_number and


                                           pl.technology_number = fc.technology_number


        where  date(pl.create_time)>=#{selectTime1} and date(pl.create_time) &lt;= #{selectTime2}


        GROUP BY fc.process_id,fc.order_number, ogd.technology_number, pl.reporting_work_id


        GROUP BY fc.process_id,fc.order_number, ogd.technology_number, pl.reporting_work_id,pl.rework_type,


            pl.rework_reason


        order by pl.id desc, fc.process_id, ogd.technology_number


    </select>




@@ -1491,7 +1496,7 @@


               fc.quantity,


               round(ogd.total_area, 2)                                       as total_area,


               od.perimeter,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,


        if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -1547,7 +1552,7 @@


               sum(fc.quantity) as quantity,


               round(ogd.total_area, 2)                                       as total_area,


               od.perimeter,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,


        if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -1603,7 +1608,7 @@


               count(*) as quantity,


               round(ogd.child_width*ogd.child_height*count(*)/1000000, 2)                                       as total_area,


               round((ogd.child_width+ogd.child_height)*2*count(*)/1000, 2)    as perimeter,


               if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -1678,7 +1683,7 @@


               sum(pl.patch_num)                                                 as quantity,


               round(ogd.total_area, 2)                                       as total_area,


               od.perimeter,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


               od.other_columns,


               round(ogd.child_width)                                         as width,


@@ -1711,6 +1716,7 @@


    <select id="getPrimaryListRefund">


        select o.customer_name,


               o.project,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               ogd.process,


               od.edging_type,


               ogd.glass_child,


@@ -1796,6 +1802,7 @@


    <select id="getPrimaryListRework">


        select o.customer_name,


               o.project,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               ogd.process,


               od.edging_type,


               ogd.glass_child,


@@ -1852,7 +1859,7 @@


               (pl.rework_num)                                              as quantity,


               round(ogd.total_area, 2)                                     as total_area,


               od.perimeter,


               if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,


               if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


               concat(od.processing_note, od.remarks)                       as remarks,


               od.other_columns,


               round(ogd.child_width)                                       as width,


@@ -2419,6 +2426,7 @@




    <select id="getPrimaryListLimt">


        select o.customer_name,


               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,


               o.project,


               #{process}                                         process,


               od.edging_type,


@@ -3283,7 +3291,7 @@


        SUM(fc.quantity) as quantity,


        round(SUM(ogd.total_area), 2)                                       as total_area,


        SUM(od.perimeter) as perimeter,


        if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),'')) as bend_radius,


        if(od.bend_radius!=null || od.bend_radius!='',od.bend_radius,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04'))) as bend_radius,


        concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,


        od.other_columns,


        round(ogd.child_width)                                         as width,