修改可入库数量的计算

huminmin

5 小时以前 be241f4251668ba0dd1d3d6d1176bc3bbe8d7ff6

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

@@ -42,7 +42,7 @@
                CASE
                    WHEN IFNULL(ls.total_product_count, 0) = 0 THEN '待入库'
                    WHEN IFNULL(ls.full_product_count, 0) >= IFNULL(ls.total_product_count, 0) THEN '完全入库'
                    WHEN IFNULL(ls.approved_product_count, 0) > 0 THEN '入库中'
                    WHEN IFNULL(ls.approved_product_count, 0) > 0 OR IFNULL(ls.pending_product_count, 0) > 0 THEN '入库中'
                    ELSE '待入库'
                END AS stock_in_status
            FROM purchase_ledger pl
@@ -52,20 +52,24 @@
                    product_status.sales_ledger_id,
                    COUNT(1) AS total_product_count,
                    SUM(CASE WHEN product_status.approved_stock_in_num > 0 THEN 1 ELSE 0 END) AS approved_product_count,
                    SUM(CASE WHEN product_status.pending_stock_in_num > 0 THEN 1 ELSE 0 END) AS pending_product_count,
                    SUM(CASE WHEN product_status.approved_stock_in_num >= product_status.product_quantity THEN 1 ELSE 0 END) AS full_product_count
                FROM (
                    SELECT
                        slp.id AS sales_ledger_product_id,
                        slp.sales_ledger_id,
                        IFNULL(slp.quantity, 0) AS product_quantity,
                        IFNULL(approved_qty.approved_stock_in_num, 0) AS approved_stock_in_num
                        IFNULL(approved_qty.approved_stock_in_num, 0) AS approved_stock_in_num,
                        IFNULL(approved_qty.pending_stock_in_num, 0) AS pending_stock_in_num
                    FROM sales_ledger_product slp
                    LEFT JOIN (
                        SELECT rel.sales_ledger_product_id,
                               IFNULL(SUM(rel.stock_in_num), 0) AS approved_stock_in_num
                               IFNULL(SUM(rel.approved_stock_in_num), 0) AS approved_stock_in_num,
                               IFNULL(SUM(rel.pending_stock_in_num), 0) AS pending_stock_in_num
                        FROM (
                            SELECT slp.id AS sales_ledger_product_id,
                                   sir.stock_in_num
                                   CASE WHEN COALESCE(sir.approval_status, 0) = 1 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS approved_stock_in_num,
                                   CASE WHEN COALESCE(sir.approval_status, 0) = 0 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS pending_stock_in_num
                            FROM stock_in_record sir
                            INNER JOIN sales_ledger_product slp
                                ON slp.type = 2
@@ -75,12 +79,13 @@
                                    (sir.batch_no IS NOT NULL AND sir.batch_no LIKE CONCAT('%-', slp.id))
                                    OR (sir.batch_no IS NULL AND sir.product_model_id = slp.product_model_id)
                                )
                            WHERE sir.approval_status = 1
                            WHERE COALESCE(sir.approval_status, 0) IN (0, 1)

                            UNION ALL

                            SELECT slp.id AS sales_ledger_product_id,
                                   sir.stock_in_num
                                   CASE WHEN COALESCE(sir.approval_status, 0) = 1 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS approved_stock_in_num,
                                   CASE WHEN COALESCE(sir.approval_status, 0) = 0 THEN COALESCE(sir.theory_stock_in_num, sir.stock_in_num) ELSE 0 END AS pending_stock_in_num
                            FROM stock_in_record sir
                            INNER JOIN quality_inspect qi
                                ON TRIM(sir.record_type) = '10'
@@ -89,7 +94,7 @@
                                ON slp.type = 2
                                AND slp.sales_ledger_id = qi.purchase_ledger_id
                                AND slp.product_model_id = qi.product_model_id
                            WHERE sir.approval_status = 1
                            WHERE COALESCE(sir.approval_status, 0) IN (0, 1)
                        ) rel
                        GROUP BY rel.sales_ledger_product_id
                    ) approved_qty ON approved_qty.sales_ledger_product_id = slp.id