From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index db628af..ceeba52 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -6,7 +6,7 @@
 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.domain.R;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.purchase.dto.PaymentRegistrationDto;
 import com.ruoyi.purchase.dto.ProductRecordDto;
@@ -70,23 +70,24 @@
 
     @Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按")
     @GetMapping("/getPaymentRegistrationById")
-    public AjaxResult getPaymentRegistrationById(Long id) {
+    public R<?> getPaymentRegistrationById(Long id) {
         PaymentRegistration byId = paymentRegistrationService.getById(id);
-        return AjaxResult.success(byId);
+        return R.ok(byId);
     }
 
     @Operation(summary = "淇敼浠樻娴佹按")
     @PutMapping("/updatePaymentRegistration")
     @Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
-    public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
-        return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
+    public R<?> updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
+        return R.ok(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
     }
 
     @Operation(summary = "鍒犻櫎浠樻娴佹按")
     @DeleteMapping("/delPaymentRegistration")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
-        return toAjax(paymentRegistrationService.delPaymentRegistration(id));
+    public R<?> delPaymentRegistration(@RequestBody List<Long> id) {
+        paymentRegistrationService.delPaymentRegistration(id);
+        return R.ok();
     }
 
     /**
@@ -126,26 +127,26 @@
     @Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
     @PostMapping("/addOrUpdateRegistration")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
-        if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+    public R<?> addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
+        if(CollectionUtils.isEmpty(ticketRegistrationDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
         for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) {
             ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1);
         }
-        return toAjax(1);
+        return R.ok();
     }
 
 
     @PostMapping("/getProductRecordById")
-    public AjaxResult getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
+    public R<?> getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
         if (productRecordDto.getId() == null) {
-            return AjaxResult.error("鍙傛暟閿欒");
+            return R.fail("鍙傛暟閿欒");
         }
-        return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
+        return R.ok(productRecordService.getProductRecordById(productRecordDto));
     }
 
     @Schema(description = "淇敼鏉ョエ鐧昏")
     @PostMapping("/updateRegistration")
-    public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
+    public R<?> updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
 
         return productRecordService.updateRecord(productRecordDto);
     }
@@ -156,8 +157,9 @@
     @Log(title = "鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)", businessType = BusinessType.DELETE)
     @DeleteMapping("/delRegistration")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult delRegistration(@RequestBody Long[] ids) {
-        return toAjax(ticketRegistrationService.delRegistration(ids));
+    public R<?> delRegistration(@RequestBody Long[] ids) {
+        ticketRegistrationService.delRegistration(ids);
+        return R.ok();
     }
 
     /**
@@ -173,18 +175,18 @@
      * 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
      */
     @GetMapping("/productRecordPage")
-    public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+    public R<?> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
 
         IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
     /**
      * 鏌ヨ鍙戠エ鍙�
      */
     @GetMapping("/getTicketNo")
-    public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
-        return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+    public R<?> getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+        return R.ok(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
     }
 
     /**
@@ -197,8 +199,8 @@
 
     @Schema(description = "鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
     @GetMapping("/getPuargeById")
-    public AjaxResult getPuargeById(Long id) {
-        return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
+    public R<?> getPuargeById(Long id) {
+        return R.ok(ticketRegistrationService.getPuargeById( id));
     }
 
 

--
Gitblit v1.9.3