Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

5 小时以前 ba957b5a448708294dead72c3c3b6f8932cc3f76

Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

 src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java

@@ -36,4 +36,7 @@
    @Schema(description = "销售产品对象数组")
    private List<ReturnSaleProductDto> returnSaleProducts;

    @Schema(description = "销售退货入库审批状态")
    private Integer stockInApprovalStatus;

}

 src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml

@@ -8,11 +8,24 @@
               si.shipping_no,
               sl.project_name,
               sl.sales_contract_no,
               sl.salesman
               sl.salesman,
                CASE
                    WHEN tempA.approval_sum = tempA.total_approval THEN 1
                    WHEN tempA.approval_sum &lt; tempA.total_approval AND tempA.approval_sum !=0 THEN 2
                    ELSE 0
                END AS stock_in_approval_status
        from return_management rm
                 left join shipping_info si on rm.shipping_id = si.id
                 left join customer c on rm.customer_id = c.id
                 left join sales_ledger sl on si.sales_ledger_id = sl.id
                LEFT JOIN (
                SELECT
                rsp.return_management_id,
                COUNT(sir.id) AS total_approval,
                SUM(CASE WHEN sir.approval_status = 1 THEN 1 ELSE 0 END) AS approval_sum
                FROM return_sale_product rsp LEFT JOIN stock_in_record sir ON rsp.id = sir.record_id
                GROUP BY rsp.return_management_id
                ) tempA ON tempA.return_management_id = rm.id
        <where>
            <if test="req.returnNo != null and req.returnNo != ''">
                and rm.return_no like concat('%',#{req.returnNo},'%')

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -116,10 +116,14 @@
        GROUP BY si.sales_ledger_product_id
        ) t5 ON t5.sales_ledger_product_id = T1.id
        LEFT JOIN (
        SELECT prop.sales_ledger_product_id, IFNULL(SUM(prop.return_quantity), 0) AS return_quantity
        FROM purchase_return_order_products prop
        INNER JOIN purchase_return_orders pro ON prop.purchase_return_order_id = pro.id
        GROUP BY prop.sales_ledger_product_id
        SELECT
            si.sales_ledger_product_id,
            SUM( CASE WHEN rsp.STATUS = 1 AND sir.approval_status = 1 THEN rsp.num ELSE 0 END ) AS return_quantity
            FROM shipping_info si
            left join return_management rm on rm.shipping_id = si.id
            left join return_sale_product rsp on rm.id = rsp.return_management_id
            left join stock_in_record sir on rsp.id = sir.record_id
            GROUP BY si.sales_ledger_product_id
        ) t6 ON t6.sales_ledger_product_id = T1.id
        left join product_model pm ON T1.product_model_id = pm.id
        left join product p ON pm.product_id = p.id