blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-07-18 a7fc2a834f16d9a35a30c4da06c79781c625cdf7 
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml


@@ -520,6 +520,8 @@


    <select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">


        select dd.delivery_id,


        dd.delivery_number,


        od.product_id,


        od.product_name,


        d.payment_terms,


        d.project,


        d.customer_id,


@@ -541,6 +543,7 @@


        dd.create_time


        from sd.delivery_detail dd


        left join sd.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>


               and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">


@@ -617,6 +620,7 @@


        count(dd.id) as 'total'


        from sd.delivery_detail dd


        left join sd.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>


            and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}


            <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">


@@ -964,6 +968,8 @@


        select dd.id,


            dd.delivery_id,


        dd.delivery_number,


        od.product_id,


        od.product_name,


        d.payment_terms,


        d.project,


        d.customer_id,


@@ -986,6 +992,7 @@


        dd.create_time


        from sd.delivery_detail dd


        left join sd.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


        left join sd.customer c on d.customer_id=c.id


        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}


    </select>


@@ -1020,6 +1027,7 @@


                                   left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number


                                   left join sd.customer c on d.customer_id=c.id


        where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}


        group by product_id


        group by dd.delivery_id,od.product_id


        order by dd.delivery_id,dd.delivery_number


    </select>


</mapper>