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

guoyuji

2024-07-02 1558c2fa4a3a1479d53977a4b46c1dda18192243

 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -876,8 +876,10 @@
    </select>

    <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
        select dd.delivery_id,od.order_id,od.product_id,od.product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
        select dd.delivery_id,od.order_id,od.product_id,pt.remarks as product_name,sum(dd.area) as area,sum(dd.money) as money,sum(dd.quantity) as quantity from
        delivery_detail dd left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
                                                            left join product pt on pt.id=od.product_id


        <where>
            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -888,8 +890,9 @@
    </select>

    <select id="getSelectOrderPrinting"  >
        select od.order_id,od.product_id,od.product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
         order_detail od
        select od.order_id,od.product_id,p.remarks as product_name,sum(od.compute_gross_area) as area,sum(od.gross_amount) as money,sum(od.quantity) as quantity from
         order_detail od left join product p on od.product_id=p.id

        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
                and od.order_id like concat('%',#{orderDetail.orderId},'%')
@@ -901,7 +904,7 @@
    <select id="getSelectDeliveryDetailPrinting" >
        select od.order_id,
               od.order_number,
               od.product_name,
               p.remarks as product_name,
               od.width,
               od.height,
               dd.quantity,
@@ -909,12 +912,32 @@
               dd.area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
               od.price,
               od.other_columns
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                 left join product p on od.product_id = p.id
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
          and od.product_id = #{productId}
    </select>

    <select id="getSelectotherMoney" >
        select bom.alias,oom.price,#{value}*dd.quantity  as count,oom.price*#{value}*dd.quantity as monery
        from delivery_detail dd
                 left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
                left join order_other_money oom on oom.order_id=dd.order_id  and oom.column=#{key}
        left join basic_other_money bom on bom.`column`=oom.`column`
        where delivery_id = #{deliveryId}
          and od.order_id = #{orderId}
    </select>

    <select id="getSelectOrderotherMoney" >
        select bom.alias,oom.price,#{value}*od.quantity as count,oom.price*#{value}*od.quantity as monery
                 from order_detail od
                 left join order_other_money oom on oom.order_id=od.order_id  and oom.column=#{key}
                 left join basic_other_money bom on bom.`column`=oom.`column`
        where  od.order_id = #{orderId}
    </select>

    <select id="getSelectOrderDetailPrinting" >
@@ -928,7 +951,8 @@
               od.compute_gross_area,
               ifnull(od.processing_note,"") as processingNote,
               ifnull(od.building_number,"") as buildingNumber,
               od.price
               od.price,
               od.other_columns
        from  order_detail od
        where  od.order_id = #{orderId}
          and od.product_id = #{productId}