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

chenlu

2024-10-11 82a5de6d2ec80b45660149c84be28734032562f6

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

@@ -41,7 +41,7 @@


    <select id="getSelectCustomerDeliveryDate" >
        select d.delivery_id,d.order_id,d.customer_id,d.customer_name,
        select d.delivery_id,dd.order_id,d.customer_id,d.customer_name,
               d.project,od.product_name,sum(dd.quantity) as quantity,sum(dd.area) as area,dd.price,sum(dd.money) as money,
                date(d.create_time) as create_time

@@ -51,7 +51,7 @@

                where date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
                and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
        group by od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -65,7 +65,7 @@
        where
             date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
            and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id, od.width, od.height) as zu
        group by od.order_id,od.product_id) as zu
    </select>

    <select id="getSelectCustomerOderDate" >
@@ -77,7 +77,7 @@
        o.customer_id,
        o.customer_name,
        sum(od.quantity) as quantity,
        sum(od.area) as area,
        sum(od.compute_gross_area) as area,
        od.shape,
        od.width,
        od.height,
@@ -91,9 +91,9 @@
        left join `order` o on o.order_id = od.order_id
        <where>
            and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                                   and o.customer_id = #{orderDetail.order.customerId}
                                   and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
        </where>
        group by od.product_id
        group by od.order_id,od.product_id
        limit #{offset},#{pageSize};
    </select>

@@ -105,9 +105,9 @@
        left join `order` o on o.order_id = od.order_id
        <where>
            and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
                and o.customer_id = #{orderDetail.order.customerId}
                and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
        </where>
        group by od.product_id, od.width, od.height) as zu
        group by od.order_id,od.product_id) as zu
    </select>

    <select id="getCustomerList">
@@ -225,7 +225,7 @@

    <select id="exportSelectCustomerDeliveryDate" >
        select d.delivery_id,
               d.order_id,
               dd.order_id,
               d.customer_name,
               d.project,
               od.product_name,
@@ -242,7 +242,7 @@
        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
        group by od.order_id,od.product_id

        UNION ALL

@@ -265,9 +265,30 @@

        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = 1855
          and d.customer_id = #{orderDetail.order.customerId}
          and om.money is not null
        group by d.delivery_id, o.order_id, om.`column`

        UNION ALL

        select d.delivery_id,
               d.order_id,
               d.customer_name,
               d.project,
               '运费'           as product_name,
               d.freight_quantity    as quantity,
               0                   as area,
               d.freight_price    as price,
               d.freight        as money,
               date(d.create_time) as create_time

        from sd.delivery d

        where date(d.create_time) >= #{startDate}
          and date(d.create_time) &lt;= #{endDate}
          and d.customer_id = #{orderDetail.order.customerId}
          and d.freight >0
        group by d.delivery_id
    </select>

    <select id="exportSelectCustomerOderDate" >
@@ -276,7 +297,7 @@
               od.product_name,
               o.customer_name,
               sum(od.quantity)     as quantity,
               sum(od.area)         as area,
               sum(od.compute_gross_area)         as area,
               od.price,
               sum(od.gross_amount) as money,
               date(o.create_time)  as create_time
@@ -285,7 +306,8 @@
        where date(o.create_time) >= #{startDate}
          and date(o.create_time) &lt;= #{endDate}
          and o.customer_id = #{orderDetail.order.customerId}
        group by od.product_id
          and o.create_order>0
        group by od.order_id,od.product_id

        UNION ALL