From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 20 ++++++++++++++++++--
1 files changed, 18 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 df60a34..d23cc11 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -9,6 +9,7 @@
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.*;
@@ -22,6 +23,7 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
+@Api(tags = "閲囪喘閫�璐у崟")
public class PurchaseReturnOrdersController {
@Autowired
private PurchaseReturnOrdersService purchaseReturnOrdersService;
@@ -40,8 +42,22 @@
@PostMapping("/add")
public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
- purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
+ purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL","no"));
}
- return AjaxResult.success(purchaseReturnOrdersService.save(purchaseReturnOrderDto));
+ return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
+
+
+ @GetMapping("/selectById/{id}")
+ public AjaxResult selectById(@PathVariable Long id) {
+ return AjaxResult.success(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
+ }
+
+ @PostMapping("/deleteById/{id}")
+ public AjaxResult deleteById(@PathVariable Long id) {
+ purchaseReturnOrdersService.deleteById(id);
+ return AjaxResult.success();
+ }
+
+
}
--
Gitblit v1.9.3