Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035

 inventory-server/src/main/resources/mapper/SaleMapper.xml

@@ -33,7 +33,31 @@
        </if>
        order by id desc
    </select>

    <select id="selectSaleListByExport" resultType="com.yuanchu.mom.utils.easyexcel.template.ExportSaleTemplate">
        select order_number AS orderNumber,
        code,
        name,
        proname,
        type,
        DATE_FORMAT(delTime, '%Y-%m-%d') AS delTime,
        note,
        order_type AS orderType
        from mom_ocean.sale
        where state=1
        <if test="orderNumber!=null and orderNumber!=''">
            and order_number like concat('%',#{orderNumber},'%')
        </if>
        <if test="name!=null and name!=''">
            and name LIKE CONCAT('%',#{name},'%')
        </if>
        <if test="type!=null ">
            and type=#{type}
        </if>
        <if test="delTime!=null and delTime!=''">
            and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
        </if>
        order by id desc
    </select>
    <!--查询订单BOM列表-->
    <select id="selectAllOrder" resultType="java.util.Map">
        select sm.id,