Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

5 天以前 ded338d0bafa5594b275edb81a8f69ea4446c37c

Merge remote-tracking branch 'origin/jtwy' into jtwy

 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

@@ -20,7 +21,7 @@
 */
@TableName("sales_ledger_product")
@Data
public class SalesLedgerProduct {
public class SalesLedgerProduct implements Serializable {
    private static final long serialVersionUID = 1L;

    /**

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -367,15 +367,19 @@
            return 0;
        }
        // 删除销售管理数据
        // 1. 先删除子表数据
        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
        productWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList);
        salesLedgerProductMapper.delete(productWrapper);
        LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList)
                .select(SalesLedgerProduct::getId);

        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(queryWrapper);
        List<Long> productIds = products.stream()
                .map(SalesLedgerProduct::getId)
                .collect(Collectors.toList());

        //批量查询productOrder
        List<ProductOrder> productOrders = productOrderMapper.selectList(
                new LambdaQueryWrapper<ProductOrder>()
                        .in(ProductOrder::getProductModelId, idList)
                        .in(ProductOrder::getProductModelId, productIds)
        );

        if (!org.springframework.util.CollectionUtils.isEmpty(productOrders)) {
@@ -405,7 +409,12 @@

            // 批量删除productOrder
            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
                    .in(ProductOrder::getProductModelId, idList));
                    .in(ProductOrder::getProductModelId, productIds));
        }

        // 批量删除产品子表
        if (!productIds.isEmpty()) {
            salesLedgerProductMapper.deleteBatchIds(productIds);
        }

        LambdaQueryWrapper<InvoiceRegistrationProduct> wrapper = new LambdaQueryWrapper<>();