Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

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

@@ -42,7 +42,12 @@


    <select id="getmaximum" >
        select count(*) from sd.delivery where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(delivery_id,8)) from 7),0)
        from
            sd.delivery as a
        where
            date(a.create_time) = curdate()
    </select>

    <select id="getmaximumMonth">
@@ -74,7 +79,7 @@
        update  sd.delivery set payment_terms=#{delivery.paymentTerms},
                                delivery_date=#{delivery.deliveryDate},
                                pay_method=#{delivery.payMethod},
                                pay_date=#{delivery.payDate},contacts=#{delivery.creator},contact_number=#{delivery.contactNumber},
                                pay_date=#{delivery.payDate},contacts=#{delivery.contacts},contact_number=#{delivery.contactNumber},
                                delivery_address=#{delivery.deliveryAddress},
                                freight=#{delivery.freightPrice}*#{delivery.freightQuantity},
                                freight_price=#{delivery.freightPrice},
@@ -106,7 +111,7 @@
        from sd.`order` o
        left join mm.finished_goods_inventory fgi on o.order_id = fgi.order_id
        <where>
            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate} and o.create_order>0
            <if test="order.orderId != null and order.orderId != ''">
                and o.order_id REGEXP #{order.orderId}
            </if>
@@ -164,7 +169,7 @@
        o.money,o.area,o.create_time,o.pack_type,o.order_type,o.creator
        from sd.`order` o left join mm.finished_goods_inventory fgi on o.order_id=fgi.order_id
        <where>
            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
            fgi.quantity_available > 0 and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate} and o.create_order>0
            <if test="order.orderId != null and order.orderId != ''">
                and o.order_id REGEXP #{order.orderId}
            </if>
@@ -244,7 +249,8 @@
    <select id="getSelectShippingOrderDetailPrinting" >
        select
        d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
        d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id
        d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id,
        d.processing_note,d.contract_id,d.delivery_date
        from sd.`order` d
        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">
@@ -300,6 +306,12 @@
            <if test="delivery.area != null and delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
            </if>
            <if test="delivery.deliveryState != null ">
                and d.delivery_state = #{delivery.deliveryState}
            </if>
            <if test="delivery.stockState != null ">
                and d.stock_state = #{delivery.stockState}
            </if>

            </where>
        group by d.delivery_id
@@ -344,6 +356,12 @@
            <if test="delivery.area != null and delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
            </if>
            <if test="delivery.deliveryState != null ">
                and d.delivery_state = #{delivery.deliveryState}
            </if>
            <if test="delivery.stockState != null ">
                and d.stock_state = #{delivery.stockState}
            </if>
        </where>
        limit #{offset},#{pageSize};
</select>
@@ -354,4 +372,7 @@
        where delivery_id = #{deliveryId}

    </update>



</mapper>