Merge remote-tracking branch 'origin/pim_yys'

maven

18 小时以前 b2859e20392f07094ec84166b83e6189665404c2

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

@@ -19,6 +19,8 @@
import io.swagger.annotations.ApiModelProperty;
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;

@@ -82,11 +84,28 @@
        return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
    }


    @GetMapping("/getProductRecordById")
    public AjaxResult getProductRecordById(Long id) {
        if (id == null) {
            return AjaxResult.error("参数错误");
        }
        return AjaxResult.success(productRecordService.getProductRecordById(id));
    }

    @ApiModelProperty("修改来票登记")
    @PostMapping("/updateRegistration")
    public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {

        return productRecordService.updateRecord(productRecordDto);
    }

    /**
     * 删除来票登记
     * 删除来票登记(来票台账)
     */
    @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));
    }
@@ -114,6 +133,7 @@
     */
    @GetMapping("/productRecordPage")
    public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {

        IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
        return AjaxResult.success(list);
    }