From 5826a876f9c1a4fb08a0d937c199e7717c51282b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 17:25:27 +0800
Subject: [PATCH] 客户往来bug修复

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

diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 73dcd51..afb3ee2 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -1,29 +1,28 @@
 package com.ruoyi.purchase.controller;
 
-import javax.servlet.http.HttpServletResponse;
-
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.purchase.dto.TicketRegistrationDto;
-import com.ruoyi.purchase.pojo.TicketRegistration;
-import com.ruoyi.purchase.service.ITicketRegistrationService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 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.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 lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
  * 鏉ョエ鐧昏Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-13
  */
@@ -34,12 +33,15 @@
 
     private ITicketRegistrationService ticketRegistrationService;
 
+    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);
@@ -50,8 +52,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, "鏉ョエ鐧昏鏁版嵁");
@@ -69,9 +70,8 @@
      * 鏂板淇敼鏉ョエ鐧昏
      */
     @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
-    @PostMapping  ("/addOrUpdateRegistration")
-    public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto)
-    {
+    @PostMapping("/addOrUpdateRegistration")
+    public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
         return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
     }
 
@@ -79,10 +79,34 @@
      * 鍒犻櫎鏉ョエ鐧昏
      */
     @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));
     }
 
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
+        try {
+            return AjaxResult.success(commonFileService.uploadFile(file, id, type));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
+     */
+    @GetMapping("/productRecordList")
+    public List<ProductRecord> productRecordList(TicketRegistrationDto ticketRegistrationDto) {
+        List<ProductRecord> list = productRecordService.selectProductRecordList(ticketRegistrationDto);
+        return list;
+    }
+
+    /**
+     * 鏌ヨ鍙戠エ鍙�
+     */
+    @GetMapping("/getTicketNo")
+    public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+        return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+    }
 }

--
Gitblit v1.9.3