入库管理，出库管理，库存管理后端接口修改

lishenao

19 小时以前 fbc53e77f994f15c3ebcd4fa07dfd23671c0ce26

 src/main/resources/mapper/inventory/StockInMapper.xml

@@ -5,41 +5,13 @@
<mapper namespace="com.ruoyi.inventory.mapper.StockInMapper">


<!--    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.ruoyi.inventory.dto.StockinDto">-->
<!--        SELECT-->
<!--            T1.id,-->
<!--            T1.product_id,-->
<!--            T1.inbound_time,-->
<!--            T1.inbound_batch,-->
<!--            T1.supplier_id,-->
<!--            T1.inbound_quantity,-->
<!--            T1.tax_inclusive_price,-->
<!--            T1.tax_inclusive_total,-->
<!--            T1.tax_rate,-->
<!--            T1.tax_exclusive_total,-->
<!--            T1.inbound_person,-->
<!--            T1.tenant_id,-->
<!--            T2.product_category,-->
<!--            T2.specification_model,-->
<!--            T3.supplier_name-->
<!--        FROM-->
<!--            stock_in T1-->
<!--                INNER JOIN-->
<!--            product_record T2-->
<!--            ON-->
<!--                T1.product_id = T2.product_id-->
<!--                INNER JOIN-->
<!--            supplier_manage T3-->
<!--            ON-->
<!--                T1.supplier_id = T3.id-->
<!--        where  T1.id = #{id,jdbcType=INTEGER}-->
<!--    </select>-->


    <select id="selectStockInWithProductInfo" resultType="com.ruoyi.inventory.dto.StockinDto">
        SELECT
        T1.id,
        T1.product_recordid,
        T1.productrecord_id,
        T1.user_id,
        T1.tenant_id,
        T1.inbound_time,
        T1.inbound_batch,
        T1.supplier_id,
@@ -48,11 +20,9 @@
        T2.tax_inclusive_total_price,
        T2.tax_rate,
        T2.tax_exclusive_total_price,
        T1.user_id,
        T1.tenant_id,
        T2.product_category,
        T2.specification_model,
        T2.unit,
        T5.product_name,
        T6.model,
        T6.unit,
        T3.supplier_name,
        T4.nick_name
        FROM
@@ -60,7 +30,7 @@
        INNER JOIN
        product_record T2
        ON
        T1.product_recordid = T2.id
        T1.productrecord_id = T2.id
        INNER JOIN
        supplier_manage T3
        ON
@@ -68,7 +38,16 @@
        INNER JOIN sys_user T4
        ON
        T1.user_id = T4.user_id
        INNER JOIN
        product_model T6
        ON
        T2.product_model_id = T6.id
        INNER JOIN
        product T5
        ON
        T2.product_id = T5.id
        <where>
            T2.type = 2
            <if test="stockinDto.supplierName != null and stockinDto.supplierName != ''">
                AND T3.supplier_name LIKE CONCAT('%', #{stockinDto.supplierName}, '%')
            </if>
@@ -79,7 +58,9 @@
    <select id="stockinExportList" resultType="com.ruoyi.inventory.excel.StockInExcelDto">
        SELECT
        T1.id,
        T1.product_recordid,
        T1.productrecord_id,
        T1.user_id,
        T1.tenant_id,
        T1.inbound_time,
        T1.inbound_batch,
        T1.supplier_id,
@@ -88,11 +69,9 @@
        T2.tax_inclusive_total_price,
        T2.tax_rate,
        T2.tax_exclusive_total_price,
        T1.user_id,
        T1.tenant_id,
        T2.product_category,
        T2.specification_model,
        T2.unit,
        T5.product_name,
        T6.model,
        T6.unit,
        T3.supplier_name,
        T4.nick_name
        FROM
@@ -100,7 +79,7 @@
        INNER JOIN
        product_record T2
        ON
        T1.product_recordid = T2.id
        T1.productrecord_id = T2.id
        INNER JOIN
        supplier_manage T3
        ON
@@ -108,15 +87,18 @@
        INNER JOIN sys_user T4
        ON
        T1.user_id = T4.user_id
        INNER JOIN
        product_model T6
        ON
        T2.product_model_id = T6.id
        INNER JOIN
        product T5
        ON
        T2.product_id = T5.id
        <where>
            T2.type = 2
            <if test="stockinDto.supplierName != null and stockinDto.supplierName != ''">
                AND T3.supplier_name LIKE CONCAT('%', #{stockinDto.supplierName}, '%')
            </if>
            <if test="stockinDto.startTime != null and stockinDto.startTime != ''">
                AND T1.inbound_time &gt;= #{stockinDto.startTime}
            </if>
            <if test="stockinDto.endTime != null and stockinDto.endTime != ''">
                AND T1.inbound_time &lt;= #{stockinDto.endTime}
            </if>
        </where>
        ORDER BY T1.inbound_time DESC