Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

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

@@ -728,7 +728,9 @@
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               ''                                              as qrcode,
               ifnull(rack,"")                                  as rack
               ifnull(rack,"")                                  as rack,
               o.quantity as orderQuantity,
               o.area as orderArea
        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
@@ -2171,6 +2173,15 @@
        order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
    </select>

    <select id="getgetPrintCustomDataSemiSp">
        select * from pp.optimize_detail opd
                 where opd.process_id= #{processId} and opd.order_sort = #{orderNumber}
        <if test="technologyNumber != null and technologyNumber != ''">
          and opd.layer = #{technologyNumber}
        </if>

    </select>

    <select id="selectPrintNotMp">
        select fc.id,
               fc.order_id,
@@ -2649,7 +2660,9 @@
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
               concat('对应我司单号', o.batch)                 AS otherRemarks,
               fc.technology_number                            as qrcode,
               o.other_remarks
               o.other_remarks,
               o.quantity as orderQuantity,
               o.area as orderArea
        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
@@ -3026,25 +3039,25 @@
            contacts,
            delivery_address                                      as deliveryAddress,
            od.processing_note                                    as processingNote,
            opt.width,
            opt.height,
            opt.o_width,
            opt.o_height,
            opl.glass_count as flowQuantity,
            CONCAT(
                    opt.width,
                    opt.o_width,
                    ' X ',
                    opt.height,
                    opt.o_height,
                    ' = ',opl.glass_count )      as size,
               CONCAT(
                       od.order_number,')      ',
                       opt.width,
                       opt.o_width,
                       ' X ',
                       opt.height,
                       opt.o_height,
                       ' = ',opl.glass_count )      as numberSize,
               CONCAT(
                       od.order_number,')','   ',
                        opt.width,
                        opt.o_width,
                       ' X ',
                       opt.height)      as numberSizeQuantity,
                       opt.o_height)      as numberSizeQuantity,
            od.order_number                                       as orderNumber,
            fc.technology_number                                  as technologyNumber,
            od.building_number                                    as buildingNumber,