From 5b83294fac4605b569a5a0d1c5e0f310026d10d4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 12 三月 2026 10:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 42363af..1e56411 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -1,7 +1,17 @@
package com.ruoyi.purchase.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.mapper.RolesMapper;
+import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -13,6 +23,27 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
+@Api(tags = "閲囪喘閫�璐у崟")
public class PurchaseReturnOrdersController {
+ @Autowired
+ private PurchaseReturnOrdersService purchaseReturnOrdersService;
+ @Autowired
+ private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+
+
+ @GetMapping("/listPage")
+ public AjaxResult listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ return AjaxResult.success(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
+ }
+
+ // 鏂板
+ @Log(title = "閲囪喘閫�璐у崟", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
+ if (purchaseReturnOrderDto.getIsDefaultNo()) {
+ purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
+ }
+ return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
+ }
}
--
Gitblit v1.9.3