yys 删除销售台账同步删除发货台账，发货审批记录

maven

20 小时以前 89fc27ddebd84a2be3e60856d6a6b2318b10db4f

yys 删除销售台账同步删除发货台账，发货审批记录

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -362,6 +362,4 @@
        }
        return null;
    }


}

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

@@ -96,6 +96,10 @@

    private final ReceiptPaymentMapper receiptPaymentMapper;

    private final ShippingInfoServiceImpl shippingInfoServiceImpl;

    private final ShippingInfoMapper shippingInfoMapper;

    private final InvoiceLedgerMapper invoiceLedgerMapper;

    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;
@@ -556,6 +560,12 @@
            wrapperTree.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgerIds);
            receiptPaymentMapper.delete(wrapperTree);
        }
        // 删除发货台账记录
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
                .eq(ShippingInfo::getSalesLedgerId, idList));
        if(CollectionUtils.isNotEmpty(shippingInfos)){
            shippingInfoServiceImpl.delete(shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList()));
        }

        // 删除生产管控数据
        // 删除生产订单数据

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

@@ -1,8 +1,11 @@
package com.ruoyi.sales.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -21,6 +24,7 @@
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.util.Collections;
import java.util.List;

/**
@@ -42,6 +46,9 @@
    private StockUtils stockUtils;
    @Autowired
    private CommonFileServiceImpl commonFileService;

    @Autowired
    private ApproveProcessServiceImpl approveProcessService;

    @Override
    public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
@@ -73,11 +80,25 @@

    @Override
    public boolean delete(List<Long> ids) {
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
                .in(ShippingInfo::getId, ids));
        // 删除附件
        commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue());
        // 扣库存
        for (Long id : ids) {
            stockUtils.deleteStockRecord(id, StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
        }
        boolean delete = this.removeBatchByIds(ids);
        return delete;
        // 删除发货审批
        if(CollectionUtils.isNotEmpty(shippingInfos)){
            for (ShippingInfo shippingInfo : shippingInfos){
                ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
                        .like(ApproveProcess::getApproveReason, shippingInfo.getShippingNo()));
                if(one != null){
                    approveProcessService.delByIds(Collections.singletonList(one.getId()));
                }
            }
        }

        return this.removeBatchByIds(ids);
    }
}