Merge remote-tracking branch 'origin/master'

chenrui

2025-05-20 1fd5eac12e532a9906e0c1d57676c692c68d1f32

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

@@ -5,19 +5,17 @@
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.basic.excel.SupplierManageExcelDto;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto;
import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductRecordMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationRecordMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.InvoiceRegistrationProductRecord;
import com.ruoyi.sales.pojo.InvoiceRegistrationRecord;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.InvoiceRegistrationService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -27,7 +25,6 @@
import org.springframework.util.ObjectUtils;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;

@@ -41,85 +38,40 @@
    private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;

    @Autowired
    private InvoiceRegistrationRecordMapper invoiceRegistrationRecordMapper;

    @Autowired
    private InvoiceRegistrationProductRecordMapper invoiceRegistrationProductRecordMapper;

    private SalesLedgerProductMapper salesLedgerProductMapper;

    /**
     * 开票登记新增
     * @param invoiceRegistrationDto
     * 开票登记记录新增
     * @param salesLedgerDto
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void invoiceRegistrationSaveOrUpdate(InvoiceRegistrationDto invoiceRegistrationDto) {
        List<InvoiceRegistrationProductDto> productDtoList = invoiceRegistrationDto.getProductDtoList();
        Integer salesLedgerId = invoiceRegistrationDto.getSalesLedgerId();
        if (null == salesLedgerId){
            throw new RuntimeException("未关联销售合同");
        }
        QueryWrapper<InvoiceRegistration> inRegWrapper = new QueryWrapper<>();
        inRegWrapper.eq("sales_ledger_id", salesLedgerId);
        InvoiceRegistration invoiceRegistration = invoiceRegistrationMapper.selectOne(inRegWrapper);
        Integer invoiceRegistrationId = null;
        // 判断是否已经做过登记，如果有合并，如果没有新增
        if(ObjectUtils.isEmpty(invoiceRegistration)){
            InvoiceRegistration insertInvocieReg = new InvoiceRegistration();
            BeanUtils.copyProperties(invoiceRegistrationDto, insertInvocieReg);
            invoiceRegistrationMapper.insert(insertInvocieReg);
            invoiceRegistrationId = insertInvocieReg.getId();
        }else {
            invoiceRegistrationId = invoiceRegistration.getId();
        }
        // 查询产品是否已经登记
        if(CollectionUtils.isNotEmpty(productDtoList)){
            QueryWrapper<InvoiceRegistrationProduct> inRegProductWrapper = new QueryWrapper<>();
            inRegProductWrapper.eq("invoice_registration_id", invoiceRegistrationId);
            List<InvoiceRegistrationProduct> invoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(inRegProductWrapper);
            if(CollectionUtils.isNotEmpty(invoiceRegistrationProductList)){
                // 批量更新
                for (InvoiceRegistrationProduct invoiceRegistrationProduct : invoiceRegistrationProductList) {
                    for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
                        if( null != invoiceRegistrationProductDto.getId() && null != invoiceRegistrationProduct.getSalesLedgerProductId()
                                && invoiceRegistrationProductDto.getId() == invoiceRegistrationProduct.getSalesLedgerProductId().longValue() ){
                            // 计算已开票数
                            invoiceRegistrationProduct.setInvoiceNum(invoiceRegistrationProduct.getInvoiceNum() + invoiceRegistrationProductDto.getInvoiceNum());
                            // 计算已开票金额
                            invoiceRegistrationProduct.setInvoiceAmount(invoiceRegistrationProduct.getInvoiceAmount().add(invoiceRegistrationProductDto.getInvoiceAmount()));
//                            // 计算未开票数
                            invoiceRegistrationProduct.setNoInvoiceNum(invoiceRegistrationProductDto.getNoInvoiceNum());
//                            // 计算未开票金额 含税总价-开票金额
                            invoiceRegistrationProduct.setNoInvoiceAmount(invoiceRegistrationProductDto.getNoInvoiceAmount());
                            invoiceRegistrationProductMapper.updateById(invoiceRegistrationProduct);
                        }
                    }
    public void invoiceRegistrationSave(SalesLedgerDto salesLedgerDto) {
        InvoiceRegistration invoiceRegistration = new InvoiceRegistration();
        BeanUtils.copyProperties(salesLedgerDto, invoiceRegistration);
        invoiceRegistration.setId(null);
        invoiceRegistration.setCustomerId(salesLedgerDto.getCustomerId().intValue());
        invoiceRegistration.setSalesLedgerId(salesLedgerDto.getId().intValue());
        invoiceRegistrationMapper.insert(invoiceRegistration);
        List<SalesLedgerProduct> productData = salesLedgerDto.getProductData();
        if(CollectionUtils.isNotEmpty(productData)){
            for (SalesLedgerProduct productDatum : productData) {
                // 如果开票数为0 跳过
                Integer currentInvoiceNum = productDatum.getCurrentInvoiceNum();
                if(null == currentInvoiceNum || currentInvoiceNum == 0){
                    continue;
                }
            }else {
                // 批量插入
                for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
                    InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
                    BeanUtils.copyProperties(invoiceRegistrationProductDto, invoiceRegistrationProduct);
                    invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistrationId);
                    invoiceRegistrationProduct.setSalesLedgerProductId(invoiceRegistrationProductDto.getId());
                    invoiceRegistrationProduct.setId(null);
                    invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
                }
            }
        }
        // 保存本次开票登记记录
        InvoiceRegistrationRecord invoiceRegistrationRecord = new InvoiceRegistrationRecord();
        BeanUtils.copyProperties(invoiceRegistrationDto, invoiceRegistrationRecord);
        invoiceRegistrationRecordMapper.insert(invoiceRegistrationRecord);
        if(CollectionUtils.isNotEmpty(productDtoList)){
            for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
                InvoiceRegistrationProductRecord invoiceRegistrationProductRecord = new InvoiceRegistrationProductRecord();
                BeanUtils.copyProperties(invoiceRegistrationProductDto, invoiceRegistrationProductRecord);
                invoiceRegistrationProductRecord.setInvoiceRegistrationRecordId(invoiceRegistrationRecord.getId());
                invoiceRegistrationProductRecord.setSalesLedgerProductId(invoiceRegistrationProductDto.getId());
                invoiceRegistrationProductRecord.setId(null);
                invoiceRegistrationProductRecordMapper.insert(invoiceRegistrationProductRecord);
                InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
                BeanUtils.copyProperties(productDatum, invoiceRegistrationProduct);
                invoiceRegistrationProduct.setId(null);
                invoiceRegistrationProduct.setSalesLedgerId(salesLedgerDto.getId().intValue());
                invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistration.getId());
                invoiceRegistrationProduct.setInvoiceAmount(productDatum.getCurrentInvoiceAmount());
                invoiceRegistrationProduct.setInvoiceNum(productDatum.getCurrentInvoiceNum());
                invoiceRegistrationProduct.setSalesLedgerProductId(productDatum.getId().intValue());
                invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
                salesLedgerProductMapper.updateById(productDatum);
            }
        }
    }