From 97857de7bc536e459f8d5de78494c03cebc3171e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 11:37:12 +0800
Subject: [PATCH] 2025-06-19修改

---
 src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 0607f3b..1ccb59b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -1,15 +1,21 @@
 package com.ruoyi.purchase.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 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.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +26,7 @@
 
 /**
  * 鏉ョエ鐧昏Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-13
  */
@@ -33,12 +39,13 @@
 
     private ICommonFileService commonFileService;
 
+    private IProductRecordService productRecordService;
+
     /**
      * 鏌ヨ鏉ョエ鐧昏鍒楄〃
      */
     @GetMapping("/list")
-    public TableDataInfo list(TicketRegistration ticketRegistration)
-    {
+    public TableDataInfo list(TicketRegistration ticketRegistration) {
         startPage();
         List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
         return getDataTable(list);
@@ -49,8 +56,7 @@
      */
     @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TicketRegistration ticketRegistration)
-    {
+    public void export(HttpServletResponse response, TicketRegistration ticketRegistration) {
         List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
         ExcelUtil<TicketRegistration> util = new ExcelUtil<TicketRegistration>(TicketRegistration.class);
         util.exportExcel(response, list, "鏉ョエ鐧昏鏁版嵁");
@@ -68,7 +74,7 @@
      * 鏂板淇敼鏉ョエ鐧昏
      */
     @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
-    @PostMapping  ("/addOrUpdateRegistration")
+    @PostMapping("/addOrUpdateRegistration")
     public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
         return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
     }
@@ -77,9 +83,8 @@
      * 鍒犻櫎鏉ョエ鐧昏
      */
     @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.DELETE)
-	@DeleteMapping("/delRegistration")
-    public AjaxResult delRegistration(@RequestBody Long[] ids)
-    {
+    @DeleteMapping("/delRegistration")
+    public AjaxResult delRegistration(@RequestBody Long[] ids) {
         return toAjax(ticketRegistrationService.delRegistration(ids));
     }
 
@@ -92,4 +97,37 @@
         }
     }
 
+    /**
+     * 鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+     */
+    @GetMapping("/productRecordList")
+    public List<ProductRecord> productRecordList(TicketRegistrationDto ticketRegistrationDto) {
+        List<ProductRecord> list = productRecordService.selectProductRecordList(ticketRegistrationDto);
+        return list;
+    }
+
+    /**
+     * 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+     */
+    @GetMapping("/productRecordPage")
+    public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+        IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 鏌ヨ鍙戠エ鍙�
+     */
+    @GetMapping("/getTicketNo")
+    public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+        return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+    }
+
+    /**
+     * 鏌ヨ鏉ョエ鐧昏鍒楄〃
+     */
+    @GetMapping("/listPage")
+    public IPage<TicketRegistration> listPage(Page page, TicketRegistration ticketRegistration) {
+        return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
+    }
 }

--
Gitblit v1.9.3