Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

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

@@ -563,7 +563,8 @@
    </select>

    <select id="selectPrintFlowCard">
        select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness
        select op.project_no,glass_total,glass_total_area,labelPrintNum,processPrintNum,glass_type,glass_thickness,
               GROUP_CONCAT(DISTINCT o.order_id SEPARATOR '~') as order_id
        from pp.optimize_project as op
                 left join pp.flow_card as fc on op.project_no=fc.project_no
                 left join sd.`order` as o on o.order_id=fc.order_id
@@ -2160,7 +2161,9 @@
                               and fcs.process = #{process}
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
        <if test="technologyNumber != null and technologyNumber != ''">
            AND position(fc.technology_number in #{technologyNumber})
        </if>
        group by fc.process_id,od.order_number, ogd.technology_number, ogd.child_width, ogd.child_height
        order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
    </select>
@@ -3010,25 +3013,25 @@
            contacts,
            delivery_address                                      as deliveryAddress,
            od.processing_note                                    as processingNote,
            od.width,
            od.height,
            opt.width,
            opt.height,
            opl.glass_count as flowQuantity,
            CONCAT(
                    TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width AS CHAR))),
                    opt.width,
                    ' X ',
                    TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height AS CHAR))),
                    opt.height,
                    ' = ',opl.glass_count )      as size,
               CONCAT(
                       od.order_number,')      ',
                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width   AS CHAR))),
                       opt.width,
                       ' X ',
                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height    AS CHAR))),
                       opt.height,
                       ' = ',opl.glass_count )      as numberSize,
               CONCAT(
                       od.order_number,')','   ',
                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.width   AS CHAR))),
                        opt.width,
                       ' X ',
                       TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(od.height    AS CHAR))))      as numberSizeQuantity,
                       opt.height)      as numberSizeQuantity,
            od.order_number                                       as orderNumber,
            fc.technology_number                                  as technologyNumber,
            od.building_number                                    as buildingNumber,