yys 修改导入导出bug

maven

2 天以前 01c28e0b62f5cea71dd9378fefa28b7177ffedba

yys  修改导入导出bug

 src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java

@@ -39,12 +39,12 @@
        String tempId = UUID.randomUUID().toString();
        String originalFilename = file.getOriginalFilename();
        if(originalFilename == null) throw new IOException("文件名不能为空");
        URLEncoder urlEncoder = new URLEncoder();
        String encodedFilename = urlEncoder.encode(originalFilename, StandardCharsets.UTF_8);
        encodedFilename = encodedFilename.replaceAll("%2E",".");
        Path tempFilePath = Paths.get(tempDir, tempId + "_" + encodedFilename);
//        URLEncoder urlEncoder = new URLEncoder();
//        String encodedFilename = urlEncoder.encode(originalFilename, StandardCharsets.UTF_8);
//        encodedFilename = encodedFilename.replaceAll("%2E",".");
//        Path tempFilePath = Paths.get(tempDir, tempId + "_" + encodedFilename);

//        Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());
        Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());

        // 2. 确保目录存在
        Path parentDir = tempFilePath.getParent();

 src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java

@@ -20,6 +20,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -100,10 +101,11 @@
    }

    /**
     * 删除来票登记
     * 删除来票登记(来票台账)
     */
    @Log(title = "来票登记", businessType = BusinessType.DELETE)
    @Log(title = "删除来票登记(来票台账)", businessType = BusinessType.DELETE)
    @DeleteMapping("/delRegistration")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delRegistration(@RequestBody Long[] ids) {
        return toAjax(ticketRegistrationService.delRegistration(ids));
    }

 src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java

@@ -10,6 +10,8 @@
@Data
public class ProductRecordDto extends ProductRecord {

    private Long ticketRegistrationId;

    //销售合同号
    private String salesContractNo;
    //客户合同号
@@ -23,6 +25,8 @@
    private String purchaseContractNumber;
    //供应商名称
    private String supplierName;
    private Long issUerId;
    private String issUer;
    //增值税
    private String invoiceAmount = "0";


 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java

@@ -252,7 +252,37 @@

    @Override
    public int delRegistration(Long[] ids) {
        return ticketRegistrationMapper.deleteBatchIds(Arrays.asList(ids));
        // 删除采购台账产品开票记录对象
        LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
        productRecordLambdaQueryWrapper.in(ProductRecord::getId, Arrays.asList(ids));
        List<ProductRecord> productRecords = productRecordMapper.selectList(productRecordLambdaQueryWrapper);
        if(CollectionUtils.isEmpty(productRecords)){
            return 0;
        }
        LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
        ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getId, productRecords.stream().map(ProductRecord::getTicketRegistrationId).collect(Collectors.toList()));
        List<TicketRegistration> ticketRegistrations = ticketRegistrationMapper.selectList(ticketRegistrationLambdaQueryWrapper);

        // 修改产品信息
        for (ProductRecord productRecord : productRecords) {
            ticketRegistrations.get(0).setInvoiceAmount(ticketRegistrations.get(0).getInvoiceAmount().subtract(productRecords.get(0).getTicketsAmount()));
            ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
            LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
            salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, productRecord.getSaleLedgerProjectId())
                    .eq(SalesLedgerProduct::getType, 2);
            List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper);
            if(!CollectionUtils.isEmpty(salesLedgerProducts)){
                for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
                    salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
                    salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
                    salesLedgerProductMapper.updateById(salesLedgerProduct);

                }
            }
        }
        // 删除采购台账产品开票记录
        productRecordMapper.delete(productRecordLambdaQueryWrapper);
        return 1;
    }

    @Override

 src/main/resources/mapper/purchase/ProductRecordMapper.xml

@@ -15,6 +15,9 @@
        pl.supplier_name,
        pr.*,
        tr.invoice_number,
        tr.iss_uer_id,
        tr.iss_uer,
        tr.id as ticketRegistrationId,
        ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
        ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
        FROM product_record pr