Merge remote-tracking branch 'origin/master'

yaowanxin

2 天以前 e83d4cecece6e8677392229e996dea22bbe2d1e9

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

@@ -8,12 +8,16 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IProductRecordService;
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.sales.service.ICommonFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -31,6 +35,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
@Api(tags = "来票登记")
public class TicketRegistrationController extends BaseController {

    private ITicketRegistrationService ticketRegistrationService;
@@ -87,7 +92,7 @@
    }

    @PostMapping("/upload")
    public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
    public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
        try {
            return AjaxResult.success(commonFileService.uploadFile(file, id, type));
        } catch (Exception e) {
@@ -105,6 +110,15 @@
    }

    /**
     * 分页查询产品信息开票记录列表
     */
    @GetMapping("/productRecordPage")
    public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
        IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
        return AjaxResult.success(list);
    }

    /**
     * 查询发票号
     */
    @GetMapping("/getTicketNo")
@@ -119,4 +133,13 @@
    public IPage<TicketRegistration> listPage(Page page, TicketRegistration ticketRegistration) {
        return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
    }

    @ApiModelProperty("根据id查询来漂登记")
    @GetMapping("/getPuargeById")
    public AjaxResult getPuargeById(Long id) {
        return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
    }



}