产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
maven
16 小时以前 3946d710296cd433660af7a2b7d94a66cf4a10e9 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java


@@ -1,24 +1,45 @@


package com.ruoyi.sales.service.impl;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;


import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.account.pojo.AccountIncome;


import com.ruoyi.account.service.AccountIncomeService;


import com.ruoyi.basic.mapper.CustomerMapper;


import com.ruoyi.basic.mapper.ProductMapper;


import com.ruoyi.basic.mapper.ProductModelMapper;


import com.ruoyi.basic.pojo.Customer;


import com.ruoyi.basic.pojo.Product;


import com.ruoyi.basic.pojo.ProductModel;


import com.ruoyi.common.enums.FileNameType;


import com.ruoyi.common.exception.base.BaseException;


import com.ruoyi.common.utils.DateUtils;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.common.utils.poi.ExcelUtil;


import com.ruoyi.framework.security.LoginUser;


import com.ruoyi.framework.web.domain.AjaxResult;


import com.ruoyi.other.mapper.TempFileMapper;


import com.ruoyi.other.pojo.TempFile;


import com.ruoyi.production.dto.ProductStructureDto;


import com.ruoyi.production.mapper.*;


import com.ruoyi.production.pojo.*;


import com.ruoyi.project.system.domain.SysDept;


import com.ruoyi.project.system.domain.SysUser;


import com.ruoyi.project.system.mapper.SysDeptMapper;


import com.ruoyi.sales.dto.MonthlyAmountDto;


import com.ruoyi.sales.dto.SalesLedgerDto;


import com.ruoyi.project.system.mapper.SysUserMapper;


import com.ruoyi.quality.mapper.QualityInspectMapper;


import com.ruoyi.quality.pojo.QualityInspect;


import com.ruoyi.sales.dto.*;


import com.ruoyi.sales.mapper.*;


import com.ruoyi.sales.pojo.*;


import com.ruoyi.sales.service.ISalesLedgerProductService;


import com.ruoyi.sales.service.ISalesLedgerService;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


@@ -30,10 +51,13 @@


import org.springframework.data.redis.core.script.DefaultRedisScript;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.multipart.MultipartFile;




import java.io.IOException;


import java.io.InputStream;


import java.lang.reflect.Field;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.nio.file.Files;


import java.nio.file.Path;


import java.nio.file.Paths;


@@ -57,12 +81,14 @@


@RequiredArgsConstructor


@Slf4j


public class SalesLedgerServiceImpl extends ServiceImpl<SalesLedgerMapper, SalesLedger> implements ISalesLedgerService {


    private final AccountIncomeService accountIncomeService;




    private final SalesLedgerMapper salesLedgerMapper;




    private final CustomerMapper customerMapper;




    private final SalesLedgerProductMapper salesLedgerProductMapper;


    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;




    private final CommonFileMapper commonFileMapper;




@@ -70,7 +96,42 @@




    private final ReceiptPaymentMapper receiptPaymentMapper;




    private final ShippingInfoServiceImpl shippingInfoServiceImpl;




    private final CommonFileServiceImpl commonFileService;




    private final ShippingInfoMapper shippingInfoMapper;




    private final InvoiceLedgerMapper invoiceLedgerMapper;




    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;




    private final SalesLedgerWorkMapper salesLedgerWorkMapper;




    private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;




    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;




    private final InvoiceRegistrationMapper invoiceRegistrationMapper;




    private final ProductOrderMapper productOrderMapper;




    private final ProcessRouteMapper processRouteMapper;


    private final ProductProcessRouteMapper productProcessRouteMapper;




    private final ProcessRouteItemMapper processRouteItemMapper;




    private final ProductProcessRouteItemMapper productProcessRouteItemMapper;




    private final ProductWorkOrderMapper productWorkOrderMapper;




    private final ProductionProductMainMapper productionProductMainMapper;




    private final ProductionProductOutputMapper productionProductOutputMapper;




    private final ProductionProductInputMapper productionProductInputMapper;




    private final QualityInspectMapper qualityInspectMapper;




    @Autowired


    private SysDeptMapper sysDeptMapper;


@@ -83,12 +144,20 @@


    private static final long LOCK_EXPIRE_TIME = 30;  // 锁自动过期时间（秒）




    private final RedisTemplate<String, String> redisTemplate;


    @Autowired


    private ProductModelMapper productModelMapper;




    @Autowired


    private ProductMapper productMapper;


    @Autowired


    private ProductStructureMapper productStructureMapper;




    @Override


    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {


        return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);


    }




    @Override


    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {


        // 1. 查询主表


        SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerDto.getId());


@@ -99,17 +168,21 @@


        // 2. 查询子表


        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();


        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());


        productWrapper.eq(SalesLedgerProduct::getType, 1);


        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);


        for (SalesLedgerProduct product : products) {


            product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());


            // 提供临时未开票数，未开票金额供前段计算


            product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());


            product.setTempNoInvoiceNum(product.getNoInvoiceNum());


            product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());


            product.setRegisterDate(LocalDateTime.now());


        }




        // 3.查询上传文件


        LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();


        salesLedgerFileWrapper.eq(CommonFile::getCommonId, salesLedger.getId());


        salesLedgerFileWrapper.eq(CommonFile::getCommonId, salesLedger.getId())


                .eq(CommonFile::getType, FileNameType.SALE.getValue());


        List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper);




        // 4. 转换 DTO


@@ -193,54 +266,206 @@


    }




    @Override


    public List<MonthlyAmountDto> getAmountHalfYear() {


    public List<MonthlyAmountDto> getAmountHalfYear(Integer type) {


        LocalDate now = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(now);


        LocalDateTime currentDateTime = LocalDateTime.now();




        List<MonthlyAmountDto> monthlyAmounts = new ArrayList<>();


        // 根据 type 确定查询的时间间隔（天数）和总查询天数


        int daysPerPeriod;


        int totalDays;


        switch (type) {


            case 1:


                daysPerPeriod = 5;   // 每5天查一次


                totalDays = 30;       // 6次 × 5天 = 30天


                break;


            case 2:


                daysPerPeriod = 15;    // 每15天查一次


                totalDays = 90;       // 6次 × 15天 = 90天


                break;


            case 3:


                daysPerPeriod = 30;   // 每30天查一次


                totalDays = 180;      // 6次 × 30天 = 180天


                break;


            default:


                throw new IllegalArgumentException("Invalid type value: " + type);


        }




        List<MonthlyAmountDto> result = new ArrayList<>();




        // 循环6次，每次查询一个时间段的数据


        for (int i = 0; i < 6; i++) {


            YearMonth targetMonth = currentMonth.minusMonths(i);


            LocalDate firstDayOfMonth = targetMonth.atDay(1);


            LocalDate firstDayOfNextMonth = targetMonth.plusMonths(1).atDay(1);


            // 计算当前时间段的起始和结束时间


            LocalDateTime endTime = currentDateTime.minusDays(i * daysPerPeriod);


            LocalDateTime startTime = endTime.minusDays(daysPerPeriod);




            LocalDateTime startOfMonth = firstDayOfMonth.atStartOfDay();


            LocalDateTime startOfNextMonth = firstDayOfNextMonth.atStartOfDay();


            // 查询回款金额


            LambdaQueryWrapper<ReceiptPayment> receiptPaymentQuery = new LambdaQueryWrapper<>();


            receiptPaymentQuery


                    .ge(ReceiptPayment::getCreateTime, startTime)


                    .lt(ReceiptPayment::getCreateTime, endTime);


            List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(receiptPaymentQuery);




            LambdaQueryWrapper<ReceiptPayment> receiptPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();


            receiptPaymentLambdaQueryWrapper.ge(ReceiptPayment::getCreateTime, startOfMonth)


                    .lt(ReceiptPayment::getCreateTime, startOfNextMonth);


            // 查询开票金额


            LambdaQueryWrapper<InvoiceLedger> invoiceLedgerQuery = new LambdaQueryWrapper<>();


            invoiceLedgerQuery


                    .ge(InvoiceLedger::getCreateTime, startTime)


                    .lt(InvoiceLedger::getCreateTime, endTime);


            List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(invoiceLedgerQuery);




            LambdaQueryWrapper<InvoiceLedger> invoiceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();


            invoiceLedgerLambdaQueryWrapper.ge(InvoiceLedger::getCreateTime, startOfMonth)


                    .lt(InvoiceLedger::getCreateTime, startOfNextMonth);




            // 获取回款金额


            List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.selectList(receiptPaymentLambdaQueryWrapper);


            //开票金额


            List<InvoiceLedger> invoiceLedgerList = invoiceLedgerMapper.selectList(invoiceLedgerLambdaQueryWrapper);




            // 使用 Stream 求和


            BigDecimal invoiceAmount = invoiceLedgerList.stream()


                    .map(InvoiceLedger::getInvoiceTotal)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);




            BigDecimal receiptAmount = receiptPaymentList.stream()


            // 计算回款总额


            BigDecimal receiptAmount = receiptPayments.stream()


                    .map(ReceiptPayment::getReceiptPaymentAmount)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);




            MonthlyAmountDto monthlyAmount = new MonthlyAmountDto();


            monthlyAmount.setMonth(targetMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")));


            monthlyAmount.setInvoiceAmount(invoiceAmount);


            monthlyAmount.setReceiptAmount(receiptAmount);


            // 计算开票总额


            BigDecimal invoiceAmount = invoiceLedgers.stream()


                    .map(InvoiceLedger::getInvoiceTotal)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);




            monthlyAmounts.add(monthlyAmount);


            // 构造返回的 DTO


            MonthlyAmountDto dto = new MonthlyAmountDto();


            dto.setMonth(startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " ~ " +


                    endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));


            dto.setReceiptAmount(receiptAmount);


            dto.setInvoiceAmount(invoiceAmount);




            result.add(dto);


        }


        Collections.reverse(monthlyAmounts);


        return monthlyAmounts;




        // 反转列表，使时间顺序从早到晚


        Collections.reverse(result);


        return result;


    }




    @Override


    public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {


        return salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);


    }




    @Autowired


    private SysUserMapper sysUserMapper;




    @Override


    @Transactional(rollbackFor = Exception.class)


    public AjaxResult importData(MultipartFile file) {


        LoginUser loginUser = SecurityUtils.getLoginUser();


        try {


            InputStream inputStream = file.getInputStream();


            ExcelUtil<SalesLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(SalesLedgerImportDto.class);


            Map<String, List<SalesLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("销售台账数据", "销售产品数据"), inputStream, 0);


            if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("销售表格为空！");


            // 业务层合并


            List<SalesLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("销售台账数据");


            if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("销售台账数据为空！");


            List<SalesLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("销售产品数据");


            if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("销售产品数据为空！");


            // 客户数据


            List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,


                    salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));


//            // 规格型号数据


//            List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getModel,


//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getSpecificationModel).collect(Collectors.toList())));


//            // 产品大类数据


//            List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,


//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));


            List<Map<String,Object>> list = productModelMapper.getProductAndModelList();


            // 录入人数据


            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,


                    salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));


            for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {


                SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()


                        .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())


                        .last("LIMIT 1"));


                if(salesLedger1 != null){


                    continue;


                }


                SalesLedger salesLedger = new SalesLedger();


                BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);


                salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));


                // 通过客户名称查询客户ID，客户合同号


                salesLedger.setCustomerId(customers.stream()


                        .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))


                        .findFirst()


                        .map(Customer::getId)


                        .orElse(null));


                salesLedger.setCustomerContractNo(customers.stream()


                        .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))


                        .findFirst()


                        .map(Customer::getTaxpayerIdentificationNumber)


                        .orElse(null));


                Long aLong = sysUsers.stream()


                        .filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson()))


                        .findFirst()


                        .map(SysUser::getUserId)


                        .orElse(null);


                if (aLong == null)


                    throw new RuntimeException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");


                salesLedger.setEntryPerson(aLong.toString());


                // 销售产品数据绑定，通过销售单号获取对应销售产品数据


                List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()


                        .filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo()))


                        .collect(Collectors.toList());


                if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))


                    throw new RuntimeException("销售单号:" + salesLedgerImportDto.getSalesContractNo() + ",无对应产品数据！");


                salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()


                        .map(SalesLedgerProductImportDto::getTaxInclusiveTotalPrice)


                        .reduce(BigDecimal.ZERO,BigDecimal::add));


                salesLedgerMapper.insert(salesLedger);






                for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {


                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();


                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);


                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());


                    salesLedgerProduct.setType(1);


                    // 计算不含税总价


                    salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));


                    salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());


                    salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());


                    list.stream()


                            .filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))


                            .findFirst()


                            .ifPresent(map -> {


                                salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));


                                salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));


                            });


//                    salesLedgerProduct.setProductId(productList.stream()


//                            .filter(product -> product.getProductName().equals(salesLedgerProduct.getProductCategory()))


//                            .findFirst()


//                            .map(Product::getId)


//                            .orElse(null));


//                    salesLedgerProduct.setProductModelId(productModels.stream()


//                            .filter(productModel -> productModel.getModel().equals(salesLedgerProduct.getSpecificationModel()))


//                            .findFirst()


//                            .map(ProductModel::getId)


//                            .orElse(null));


                    salesLedgerProduct.setRegister(loginUser.getNickName());


                    salesLedgerProduct.setRegisterDate(LocalDateTime.now());


                    salesLedgerProduct.setApproveStatus(0);


                    salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());


                    salesLedgerProductMapper.insert(salesLedgerProduct);


                }


            }




            return AjaxResult.success("导入成功");


        } catch (Exception e) {


            e.printStackTrace();


        }


        return AjaxResult.success("导入失败");


    }




    @Override


    public List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId) {






        List<LossProductModelDto> lossProductModelDtos = salesLedgerProductMapper.selectProductBomStructure(salesLedgerId);






        return lossProductModelDtos;


    }






    // 内部类用于存储聚合结果


    private static class GroupedCustomer {


@@ -300,15 +525,71 @@


        List<Long> idList = Arrays.stream(ids)


                .filter(Objects::nonNull)


                .collect(Collectors.toList());




        if (CollectionUtils.isEmpty(idList)) {


            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());


        //删除生产数据


        salesLedgerProductServiceImpl.deleteProductionData(productIds);




        // 批量删除产品子表


        if (!productIds.isEmpty()) {


            salesLedgerProductMapper.deleteBatchIds(productIds);


        }




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


        wrapper.in(InvoiceRegistrationProduct::getSalesLedgerId, idList);


        List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(wrapper);


        List<Integer> invoiceLedgerIds = new ArrayList<>();


        if (CollectionUtils.isNotEmpty(invoiceRegistrationProducts)) {


            LambdaQueryWrapper<InvoiceLedger> wrapperOne = new LambdaQueryWrapper<>();


            wrapperOne.in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList()));


            List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(wrapperOne);


            if (CollectionUtils.isNotEmpty(invoiceLedgers)) {


                invoiceLedgerIds = invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList());


            }


            invoiceLedgerMapper.delete(wrapperOne);


        }


        invoiceRegistrationProductMapper.delete(wrapper);


        LambdaQueryWrapper<InvoiceRegistration> wrapperTwo = new LambdaQueryWrapper<>();


        wrapperTwo.in(InvoiceRegistration::getSalesLedgerId, idList);


        invoiceRegistrationMapper.delete(wrapperTwo);




        if (CollectionUtils.isNotEmpty(invoiceLedgerIds)) {


            LambdaQueryWrapper<ReceiptPayment> wrapperTree = new LambdaQueryWrapper<>();


            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()));


        }


        // 删除附件表


        commonFileService.deleteByBusinessIds(idList, FileNameType.SALE.getValue());




        // 删除生产管控数据


        // 删除生产订单数据


        LambdaQueryWrapper<SalesLedgerScheduling> in = new LambdaQueryWrapper<SalesLedgerScheduling>()


                .in(SalesLedgerScheduling::getSalesLedgerId, idList);


        salesLedgerSchedulingMapper.delete(in);


        // 删除生产派工数据


        LambdaQueryWrapper<SalesLedgerWork> workOrderWrapper = new LambdaQueryWrapper<>();


        workOrderWrapper.in(SalesLedgerWork::getSalesLedgerId, idList);


        salesLedgerWorkMapper.delete(workOrderWrapper);


        // 删除生产核算数据


        LambdaQueryWrapper<SalesLedgerProductionAccounting> reportWrapper = new LambdaQueryWrapper<>();


        reportWrapper.in(SalesLedgerProductionAccounting::getSalesLedgerId, idList);


        salesLedgerProductionAccountingMapper.delete(reportWrapper);


        // 2. 再删除主表数据


        return salesLedgerMapper.deleteBatchIds(idList);


    }


@@ -327,7 +608,6 @@


            SalesLedger salesLedger = convertToEntity(salesLedgerDto);


            salesLedger.setCustomerName(customer.getCustomerName());


            salesLedger.setTenantId(customer.getTenantId());




            // 3. 新增或更新主表


            if (salesLedger.getId() == null) {


                String contractNo = generateSalesContractNo();


@@ -404,12 +684,15 @@




            try {


                // 执行文件迁移（使用原子操作确保安全性）


                Files.move(


                        Paths.get(tempFile.getTempPath()),


                        formalFilePath,


                        StandardCopyOption.REPLACE_EXISTING,


                        StandardCopyOption.ATOMIC_MOVE


                );


//                Files.move(


//                        Paths.get(tempFile.getTempPath()),


//                        formalFilePath,


//                        StandardCopyOption.REPLACE_EXISTING,


//                        StandardCopyOption.ATOMIC_MOVE


//                );


                // 原子移动失败，使用复制+删除


                Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);


                Files.deleteIfExists(Paths.get(tempFile.getTempPath()));


                log.info("文件迁移成功: {} -> {}", tempFile.getTempPath(), formalFilePath);




                // 更新文件记录（关联到业务ID）


@@ -418,7 +701,8 @@


                fileRecord.setName(originalFilename);


                fileRecord.setUrl(formalFilePath.toString());


                fileRecord.setCreateTime(LocalDateTime.now());


                fileRecord.setType("1");


                //销售


                fileRecord.setType(FileNameType.SALE.getValue());


                commonFileMapper.insert(fileRecord);




                // 删除临时文件记录


@@ -456,7 +740,10 @@


                salesLedgerProduct.setType(type);


                salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());


                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());


                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());


                salesLedgerProductMapper.insert(salesLedgerProduct);


                // 添加生产数据


                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


            }


        }


    }


@@ -497,11 +784,11 @@


            }




            // 2. 查询当天/公司已存在的序列号（与原逻辑一致）


            Integer tenantId = SecurityUtils.getLoginUser().getTenantId();


            if(null != tenantId){


            Long tenantId = SecurityUtils.getLoginUser().getTenantId();


            if (null != tenantId) {


                //获取公司编号


                SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());


                if(!ObjectUtils.isEmpty(sysDept)){


                if (!ObjectUtils.isEmpty(sysDept)) {


                    datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;


                }


            }


@@ -510,12 +797,12 @@




            return datePart + String.format("%03d", nextSequence);


        } finally {


            // 3. 释放锁（使用Lua脚本保证原子性，避免误删其他线程的锁）


            // 3. 释放锁


            String luaScript = "if redis.call('GET', KEYS[1]) == ARGV[1] then return redis.call('DEL', KEYS[1]) else return 0 end";


            redisTemplate.execute(


                    new DefaultRedisScript<>(luaScript, Long.class),


                    Collections.singletonList(lockKey),


                    lockValue // 只有持有相同值的线程才能删除锁


                    lockValue


            );


        }


    }


@@ -524,7 +811,7 @@


        if (sequences.isEmpty()) {


            return 1;


        }


        // 排序后查找第一个缺失的正整数（与原逻辑一致）


        // 排序后查找第一个缺失的正整数


        sequences.sort(Integer::compareTo);


        int next = 1;


        for (int seq : sequences) {


@@ -554,14 +841,13 @@


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);




        // 构造主表更新对象（支持任意主表类型）


        // 构造主表更新对象


        try {


            S entity = mainEntityClass.getDeclaredConstructor().newInstance();


            Field idField = mainEntityClass.getDeclaredField("id");


            idField.setAccessible(true);


            idField.set(entity, mainId);




            // 设置 contractAmount 字段，注意这里假设字段名为 "contractAmount"


            Field amountField = mainEntityClass.getDeclaredField("contractAmount");


            amountField.setAccessible(true);


            amountField.set(entity, totalAmount);