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


@@ -784,6 +784,14 @@


          and position(fc.technology_number in #{technologyNumber})


        group by fc.process_id, fc.order_number


        <choose>


            <!-- 当 landingSequence != 1 且 flashback != 1 时，按 landing_sequence 倒序 -->


            <when test="landingSequence != 1 and flashback != 1">


                ORDER BY landing_sequence,fc.id desc


            </when>


            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->


            <when test="landingSequence != 1">


                ORDER BY landing_sequence DESC


            </when>


            <!-- flashback = 1 时正序 -->


            <when test="flashback == 1">


                ORDER BY


@@ -1473,6 +1481,13 @@


          and position(fc.technology_number in #{technologyNumber})


        group by fc.process_id, fc.order_number, fc.technology_number


        <choose>


            <when test="landingSequence != 1 and flashback != 1">


                ORDER BY landing_sequence,fc.id desc


            </when>


            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->


            <when test="landingSequence != 1">


                ORDER BY landing_sequence DESC


            </when>


            <!-- flashback = 1 时正序 -->


            <when test="flashback == 1">


                ORDER BY


@@ -1522,6 +1537,13 @@


        where fc.process_id = #{processId} and fc.`merge`=1


        group by fc.process_id, fc.order_number


        <choose>


            <when test="landingSequence != 1 and flashback != 1">


                ORDER BY landing_sequence,fc.id desc


            </when>


            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->


            <when test="landingSequence != 1">


                ORDER BY landing_sequence DESC


            </when>


            <!-- flashback = 1 时正序 -->


            <when test="flashback == 1">


                ORDER BY


@@ -1916,10 +1938,10 @@


               contacts,


               delivery_address                                      as deliveryAddress,


               od.processing_note                                    as processingNote,


               round(ogd.child_width)                                as width,


               round(ogd.child_height)                               as height,


              ogd.child_width                                as width,


               ogd.child_height                              as height,


               fc.quantity,


               CONCAT(round(ogd.child_width)  , ' X ', round(ogd.child_height)   ,' = ',fc.quantity )           as size,


               CONCAT(ogd.child_width  , ' X ', ogd.child_height   ,' = ',fc.quantity )           as size,


               od.order_number                                       as orderNumber,


               fc.technology_number                                  as technologyNumber,


               od.building_number                                    as buildingNumber,


@@ -1929,6 +1951,7 @@


               c.customer_abbreviation                               as customerAbbreviation,


               p.product_abbreviation                                as productAbbreviation,


               CONCAT(fc.process_id, '/', fc.technology_number)      as processId,


               SUBSTRING(fc.process_id,12  )                                        as processIdAD ,/*-流程卡简写-*/


               o.create_time                                         as createTime,


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


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS figureNumber,


@@ -1942,7 +1965,18 @@


               od.bend_radius                                        as bendRadius,


               ogd.glass_child                                       as glassChild,


               ogd.glass_address                                     as glassAddress,


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color


               JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color'))  AS color,


               CONCAT(


                       od.order_number,')      ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),


                       ' = ',fc.quantity )      as numberSize,


               CONCAT(


                       od.order_number,')','   ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),


                       ' X ',


                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))))      as numberSizeQuantity


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join flow_card as fc on o.order_id = fc.order_id and


@@ -2127,8 +2161,8 @@


               contacts,


               o.delivery_address                                    as deliveryAddress,


               od.processing_note                                    as processingNote,


               round(ogd.child_width)                                as width,


               round(ogd.child_height)                               as height,


               ogd.child_width                                as width,


               ogd.child_height                              as height,


               pl.patch_num                                          as quantity,


               pl.order_sort                                         as orderNumber,


               pl.technology_number                                  as technologyNumber,


@@ -3209,6 +3243,13 @@


        and position(fc.technology_number in #{compound})


        group by fc.process_id, fc.order_number


        <choose>


            <when test="landingSequence != 1 and flashback != 1">


                ORDER BY landing_sequence,fc.id desc


            </when>


            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->


            <when test="landingSequence != 1">


                ORDER BY landing_sequence DESC


            </when>


            <!-- flashback = 1 时正序 -->


            <when test="flashback == 1">


                ORDER BY


@@ -3258,6 +3299,13 @@


        and position(fc.technology_number in #{compound})


        group by fc.process_id, fc.order_number


        <choose>


            <when test="landingSequence != 1 and flashback != 1">


                ORDER BY landing_sequence,fc.id desc


            </when>


            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->


            <when test="landingSequence != 1">


                ORDER BY landing_sequence DESC


            </when>


            <!-- flashback = 1 时正序 -->


            <when test="flashback == 1">


                ORDER BY