feat:合并开票

shiyunteng

2026-09-07 c631edf462f4ab19403f5194dec743168e2a0e79

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractInvoiceController.java

@@ -4,10 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
import com.by4cloud.platformx.business.dto.ContractQueryDTO;
import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.entity.ContractInvoice;
import com.by4cloud.platformx.business.entity.ContractOutBound;
@@ -110,6 +107,15 @@
   }

   /**
    * 获取合并开票合同出库信息
    * @return
    */
   @PostMapping("/getMergeContractOutBound" )
   public R getMergeContractOutBound(@RequestBody Long[] ids) {
      return contractInvoiceService.getMergeContractOutBound(ids);
   }

   /**
    * 生成开票预览信息
    * @return
    */
@@ -119,12 +125,30 @@
   }

   /**
    * 生成开票预览信息
    * @return
    */
   @PostMapping("/genMergeInvoiceInfo" )
   public R genMergeInvoiceInfo(@RequestBody GenMergeInvoiceDTO mergeInvoiceDTO) {
      return contractInvoiceService.genMergeInvoiceInfo(mergeInvoiceDTO);
   }

   /**
    * 开合并蓝票
    * @return
    */
   @PostMapping("/toMergeInvoice" )
   public R toMergeInvoice(@RequestBody ToMergeInvoiceDTO toMergeInvoiceDTO) {
      return contractInvoiceService.toMergeInvoice(toMergeInvoiceDTO);
   }

   /**
    * 开蓝票
    * @return
    */
   @PostMapping("/toInvoice" )
   public R toInvoice(@RequestBody GenInvoiceInfoDTO genInvoiceInfoDTO) {
      return contractInvoiceService.toInvoice(genInvoiceInfoDTO);
   public R toInvoice(@RequestBody ToInvoiceDTO toInvoiceDTO) {
      return contractInvoiceService.toInvoice(toInvoiceDTO);
   }

   /**
@@ -174,6 +198,24 @@
   }

   /**
    * 手动推送bip
    * @return
    */
   @GetMapping("/bipPushPdf/{invoiceId}")
   public R bipPushPdf(@PathVariable("invoiceId")Long invoiceId) {
      return contractInvoiceService.bipPushPdf(invoiceId);
   }

   /**
    * 保存并推送
    * @return
    */
   @PostMapping("/saveAndPush")
   public R saveAndPush(@RequestBody ContractInvoiceUpateDTO upateDTO) {
      return contractInvoiceService.saveAndPush(upateDTO);
   }

   /**
    * 红票查询
    * @return
    */
@@ -192,4 +234,25 @@
   public R queryInvoice(@ParameterObject Page page, @ParameterObject InvoiceQueryDTO queryDTO) {
      return contractInvoiceService.queryInvoice(page, queryDTO);
   }

   /**
    * 通过id查询
    * @return R
    */
   @Operation(summary = "通过id查询" , description = "通过id查询" )
   @GetMapping("/{id}" )
   public R getById(@PathVariable("id" ) Long id) {
      return R.ok(contractInvoiceService.getById(id));
   }


   /**
    * 通过key查询bip字典
    * @return R
    */
   @Operation(summary = "通过key查询bip字典" , description = "通过key查询bip字典" )
   @GetMapping("/selectBipByKey/{dictKey}" )
   public R selectBipByKey(@PathVariable("dictKey" ) String dictKey) {
      return contractInvoiceService.selectBipByKey(dictKey);
   }
}