发货去除库存数量限制，产品库存不足也可以发货，库存数量可以展示为负

huminmin

8 天以前 cd0984bff3ac9c4480685671d4e033c8b082bfed

 src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml

@@ -6,39 +6,174 @@


    <select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
        select sl.customer_contract_no,
               sl.customer_name,
               sl.project_name,
               sl.contract_amount,
               pl.contract_amount as purchase_amount,
               sum(slp.tax_exclusive_total_price) as sale_tax_exclusive_total_price,
               sum(pr.tax_exclusive_total_price) as tax_exclusive_total_price,
               (sl.contract_amount-pl.contract_amount) as balance,
        CONCAT(FORMAT((sl.contract_amount - pl.contract_amount) / sl.contract_amount * 100, 2), '%') AS balance_ratio,
               sl.contract_amount-sum(slp.tax_exclusive_total_price)-(pl.contract_amount-sum(pr.tax_exclusive_total_price)) as balance_amount
        from purchase_ledger pl
                 left join sales_ledger sl on pl.sales_ledger_id = sl.id
                 left join product_record pr on pr.purchase_ledger_id = pl.id
                 left join sales_ledger_product slp on slp.sales_ledger_id = sl.id

        group by sl.customer_contract_no, sl.customer_name, sl.project_name, sl.contract_amount, pl.contract_amount
        having sl.customer_contract_no is not null
        SELECT
        sl.sales_contract_no AS customerContractNo,
        sl.customer_name,
        sl.contract_amount AS contract_amount,
        SUM( pl.contract_amount ) AS purchase_amount,
        (
        sl.contract_amount - SUM( pl.contract_amount )) AS balance,
        CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
        FROM
        sales_ledger sl
        INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
        <where>
            <if test="c.customerName != null and c.customerName != ''">
                and sl.customer_name like concat('%',#{c.customerName},'%')
                AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
            </if>
        </where>
        GROUP BY
        sl.sales_contract_no,
        sl.customer_name,
        sl.contract_amount
        ORDER BY
        sl.sales_contract_no
    </select>
    <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
            SELECT
                DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
                ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
            FROM invoice_ledger il
                     LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
            WHERE il.invoice_no IS NOT NULL
              AND invoice_type = '增专票'
            GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
            ORDER BY month;
        <!--        select *-->
        <!--        from (SELECT-->
        <!--                  COALESCE(a1.month, a2.month) AS month,-->
        <!--                  IFNULL(a1.tax_amount, 0) AS j_tax_amount,-->
        <!--                  IFNULL(a2.x_tax_amount, 0) AS x_tax_amount-->
        <!--              FROM (-->
        <!--                       &#45;&#45; 第一个查询：来自 invoice_ledger 的税额-->
        <!--                       SELECT-->
        <!--                           DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,-->
        <!--                           ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount-->
        <!--                       FROM invoice_ledger il-->
        <!--                                LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id-->
        <!--                       WHERE il.invoice_no IS NOT NULL-->
        <!--                         AND invoice_type = '增专票'-->
        <!--                         AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL  &#45;&#45; 新增：过滤month为NULL的情-->
        <!--                       GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')-->
        <!--                   ) a1-->
        <!--                       LEFT JOIN (-->
        <!--                  &#45;&#45; 第二个查询：来自 ticket_registration 的税额-->
        <!--                  SELECT-->
        <!--                      DATE_FORMAT(a.issue_date, '%Y-%m') AS month,-->
        <!--                      SUM(a.invoice_amount) AS x_tax_amount-->
        <!--                  FROM (-->
        <!--                           SELECT DISTINCT pr.id,-->
        <!--                                           tr.issue_date,-->
        <!--                                           ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,-->
        <!--                                           ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount-->
        <!--                           FROM product_record pr-->
        <!--                                    LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id-->
        <!--                                    LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id-->
        <!--                                    LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id-->
        <!--                                    LEFT JOIN product_model pm ON pm.id = pr.product_model_id-->
        <!--                           WHERE type = 2-->
        <!--                             AND tr.invoice_number IS NOT NULL-->
        <!--                       ) a-->
        <!--                  GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')-->
        <!--              ) a2 ON a1.month = a2.month-->

        <!--              UNION ALL-->

        <!--              SELECT-->
        <!--                  COALESCE(a1.month, a2.month) AS month,-->
        <!--                  IFNULL(a1.tax_amount, 0) AS tax_amount,-->
        <!--                  IFNULL(a2.x_tax_amount, 0) AS x_tax_amount-->
        <!--              FROM (-->
        <!--                       &#45;&#45; 第二个查询：来自 ticket_registration 的税额（反过来补全没有匹配到的）-->
        <!--                       SELECT-->
        <!--                           DATE_FORMAT(a.issue_date, '%Y-%m') AS month,-->
        <!--                           SUM(a.invoice_amount) AS x_tax_amount-->
        <!--                       FROM (-->
        <!--                                SELECT DISTINCT pr.id,-->
        <!--                                                tr.issue_date,-->
        <!--                                                ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,-->
        <!--                                                ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount-->
        <!--                                FROM product_record pr-->
        <!--                                         LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id-->
        <!--                                         LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id-->
        <!--                                         LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id-->
        <!--                                         LEFT JOIN product_model pm ON pm.id = pr.product_model_id-->
        <!--                                WHERE type = 2-->
        <!--                                  AND tr.invoice_number IS NOT NULL-->
        <!--                            ) a-->
        <!--                       GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')-->
        <!--                   ) a2-->
        <!--                       LEFT JOIN (-->
        <!--                  &#45;&#45; 第一个查询：来自 invoice_ledger 的税额-->
        <!--                  SELECT-->
        <!--                      DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,-->
        <!--                      ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount-->
        <!--                  FROM invoice_ledger il-->
        <!--                           LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id-->
        <!--                  WHERE il.invoice_no IS NOT NULL-->
        <!--                    AND invoice_type = '增专票'-->
        <!--                    AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL  &#45;&#45; 新增：过滤month为NULL的情-->
        <!--                  GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')-->
        <!--              ) a1 ON a1.month = a2.month-->
        <!--              WHERE a1.month IS NULL-->
        <!--              ORDER BY month-->
        <!--             )as a-->
        <!--        <where>-->
        <!--            a.month is not null-->
        <!--            <if test="month != null">-->
        <!--                and a.month = #{month}-->
        <!--            </if>-->
        <!--        </where>-->
        select * from (
        SELECT
        month,
        SUM(sales_tax_amount) AS j_tax_amount,
        SUM(purchase_tax_amount) AS x_tax_amount
        FROM (
        SELECT
        DATE_FORMAT(entry_date, '%Y-%m') AS month,
        ROUND(SUM(contract_amount * 0.13), 2) AS sales_tax_amount,
        0 AS purchase_tax_amount
        FROM sales_ledger
        WHERE entry_date IS NOT NULL
        GROUP BY DATE_FORMAT(entry_date, '%Y-%m')

        UNION ALL

        SELECT
        DATE_FORMAT(entry_date, '%Y-%m') AS month,
        0 AS sales_tax_amount,
        ROUND(SUM(contract_amount * 0.26), 2) AS purchase_tax_amount
        FROM purchase_ledger
        WHERE entry_date IS NOT NULL
        GROUP BY DATE_FORMAT(entry_date, '%Y-%m')
        ) t
        GROUP BY month
        ORDER BY month
        ) a
        <where>
            a.month is not null
            <if test="month != null and month != ''">
                and a.month = #{month}
            </if>
        </where>

    </select>
    <select id="listVat1" resultType="com.ruoyi.purchase.dto.VatDto">
        #             SELECT
#                 DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
#                 ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
#             FROM invoice_ledger il
#                      LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
#             WHERE il.invoice_no IS NOT NULL
#               AND invoice_type = '增专票'
#             GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
#             ORDER BY month;
#         select DATE_FORMAT(a.issue_date, '%Y-%m'), sum(a.invoice_amount) as xTaxAmount
#         from (SELECT distinct pr.id,
#                               tr.issue_date,
#                               ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
#                               ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100),
#                                     2)                                              AS invoice_amount
#               FROM product_record pr
#                        LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
#                        LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
#                        LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
#                        LEFT JOIN product_model pm ON pm.id = pr.product_model_id
#               WHERE type = 2
#                 and tr.invoice_number is not null) a
#         GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
    </select>

</mapper>
</mapper>