销售退货：查询列表新增入库审批状态字段

zouyu

3 小时以前 d4af1d13fd1a3e1dd343d6460b6ff6392cf51e4e

销售退货：查询列表新增入库审批状态字段

 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},'%')