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

guoyuji

2024-06-25 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7

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

@@ -603,31 +603,37 @@
        <result column="delivery_address" property="order.deliveryAddress"/>
        <result column="processing_note" property="processingNote"/>
        <result column="quantity" property="quantity"/>
        <result column="edging_type" property="edgingType"/>
        <result column="product_name" property="productName"/>
        <result column="building_number" property="buildingNumber"/>
    </resultMap>

    <select id="getPrintCustomData" resultMap="orderDetial">
        select o.order_id,
    <select id="getPrintCustomData" >
        select o.order_id as orderId,
               project,
               customer_id,
               customer_name,
               order_type,
               order_classify,
               customer_id as customerId,
               customer_name as customerName,
               order_type as  orderType,
               order_classify as orderClassify,
               batch,
               o.icon,
               pack_type,
               delivery_date,
               al_type,
               pack_type as packType,
               delivery_date as deliveryDate,
               al_type as alType,
               money,
               contract_id,
               customer_batch,
               contract_id as contractId,
               customer_batch customerBatch,
               contacts,
               delivery_address,
               od.processing_note,
                width,
                height,
               delivery_address as deliveryAddress,
               od.processing_note as processingNote,
               width,
               height,
               od.quantity,
               od.order_number,
               fc.technology_number
               od.order_number as orderNumber,
               fc.technology_number as technologyNumber,
               od.building_number as buildingNumber,
               od.product_name as productName,
               od.edging_type as edgingType

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