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

chenlu

2024-05-23 0a567fd9c3baeb8022c77fa1a6a96d4c60cfa11c

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

@@ -903,4 +903,63 @@
          and od.order_id = #{orderId}
          and od.product_id = #{productId}
    </select>


    <select id="exportDeliveryDetailReport">
        select dd.id,
            dd.delivery_id,
        dd.delivery_number,
        d.payment_terms,
        d.project,
        d.customer_id,
        d.customer_name,
        d.delivery_date,
        d.pay_method,
        d.pay_date,
        d.salesman,
        d.creator,
        d.contacts,
        d.contact_number,
        d.delivery_address,
        dd.order_id,
        dd.order_number,
        dd.area,
        dd.money,
        dd.quantity,
        dd.delivery_detail_remakes,
        dd.create_time
        from sd.delivery_detail dd
        left join sd.delivery d on dd.delivery_id=d.delivery_id
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
    </select>

    <select id="exportDeliveryDetailProductReport">
        select dd.id,
            dd.delivery_id,
               dd.delivery_number,
               od.product_id,
               od.product_name,
               d.payment_terms,
               d.project,
               d.customer_id,
               d.customer_name,
               d.delivery_date,
               d.pay_method,
               d.pay_date,
               d.salesman,
               d.creator,
               d.contacts,
               d.contact_number,
               d.delivery_address,
               dd.order_id,
               dd.order_number,
               sum(dd.area) as area,
               sum(dd.money) as money,
               sum(dd.quantity) as quantity,
               dd.delivery_detail_remakes,
               dd.create_time
        from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
                                   left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
    </select>
</mapper>