产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
3 天以前 667d59e59a94fdbcb168904fbf40a011e15acc98 
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java


@@ -12,6 +12,7 @@


import com.ruoyi.basic.pojo.Product;


import com.ruoyi.basic.pojo.ProductModel;


import com.ruoyi.basic.pojo.SupplierManage;


import com.ruoyi.common.enums.FileNameType;


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


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.StringUtils;


@@ -38,6 +39,7 @@


import org.apache.commons.io.FilenameUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.data.redis.core.StringRedisTemplate;


import org.springframework.stereotype.Service;




import java.io.IOException;


@@ -50,6 +52,7 @@


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.stream.Collectors;




/**


@@ -85,6 +88,8 @@


    private final ProductRecordMapper productRecordMapper;




    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;




    private final StringRedisTemplate redisTemplate;




    @Value("${file.upload-dir}")


    private String uploadDir;


@@ -276,7 +281,7 @@


                fileRecord.setName(originalFilename);


                fileRecord.setUrl(formalFilePath.toString());


                fileRecord.setCreateTime(LocalDateTime.now());


                fileRecord.setType("2");


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


                commonFileMapper.insert(fileRecord);




                // 删除临时文件记录


@@ -299,7 +304,7 @@


        // 批量删除关联的采购台账产品


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


        queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, ids)


                .eq(SalesLedgerProduct::getType, "2");


                .eq(SalesLedgerProduct::getType, 2);


        salesLedgerProductMapper.delete(queryWrapper);


        // 批量删除关联的采购台账的来票登记


        LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();


@@ -367,6 +372,7 @@


        }


        // 创建并填充DTO


        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();


        resultDto.setSalesLedgerId(purchaseLedger.getSalesLedgerId());


        resultDto.setSalesContractNoId(purchaseLedger.getSalesLedgerId());


        resultDto.setSalesContractNo(purchaseLedger.getSalesContractNo());


        resultDto.setSupplierName(purchaseLedger.getSupplierName());


@@ -409,6 +415,7 @@


    public PurchaseLedgerDto getPurchaseNoById(Long id) {


        PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();


        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);




        BeanUtils.copyProperties(purchaseLedger, purchaseLedgerDto);


//        TicketRegistration ticketRegistration = ticketRegistrationMapper.selectOne(new LambdaQueryWrapper<TicketRegistration>().eq(TicketRegistration::getPurchaseLedgerId, id));


//        if (ticketRegistration != null) {


@@ -420,12 +427,13 @@


    }




    @Override


    public IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger) {


        LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();


        if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {


            queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber());


        }


        return purchaseLedgerMapper.selectPage(ipage, queryWrapper);


    public IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger) {


        IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerMapper.selectPurchaseLedgerListPage(ipage, purchaseLedger);


        purchaseLedgerDtoIPage.getRecords().forEach(purchaseLedgerDto -> {


            List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, purchaseLedgerDto.getId()).eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue()));


            purchaseLedgerDto.setSalesLedgerFiles(commonFiles);


        });


        return purchaseLedgerDtoIPage;


    }




    @Override


@@ -440,6 +448,26 @@


        return invoiceRegistrationProducts;


    }




    @Override


    public String getPurchaseNo() {


        // 生成日期前缀（例如：CG20250405）


        String purchaseNo = "CG" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));




        // 构建 Redis Key（按天分隔）


        String redisKey = "purchase_no:" + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);




        // 获取当前序号并递增（原子操作）


        Long sequence = redisTemplate.opsForValue().increment(redisKey);




        // 设置过期时间（次日失效，防止冗余数据）


        if (sequence == 1) {


            redisTemplate.expire(redisKey, 1, TimeUnit.DAYS);


        }




        // 返回完整编号（如 CG202504050001）


        return purchaseNo + String.format("%03d", sequence);


    }




    /**


     * 下划线命名转驼峰命名


     */