陶杰
2024-12-16 da12030e9d76e0a1dacea3c3bd612d646f90066e
src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -6,7 +6,9 @@
        SELECT q.*, o.warehouse_name, o.warehouse_location_code, o.payment_time
        FROM t_delivery_order q
        join t_order o on q.order_id = o.id
        WHERE q.deleted = 0 and o.deleted = 0
        left join t_warehouse w on o.warehouse_id=w.id
        left join t_warehouse_location wl on o.warehouse_location_id=wl.id
        WHERE q.deleted = 0 and o.deleted = 0 and w.deleted=0 and wl.deleted=0
        and q.supplier_id = #{supplierId}
        <if test="condition.orderNo != null and condition.orderNo != ''">
            AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
@@ -29,7 +31,8 @@
        <if test="condition.endDate != null">
            AND o.payment_time &lt; #{condition.endDate}
        </if>
        ORDER BY o.payment_time
--         ORDER BY o.payment_time
        order by w.seq,wl.seq asc
    </select>
    <select id="selectDoStationList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderStationListDTO">