From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 67273d1..8d0a942 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -5,16 +5,16 @@
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 org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
@@ -22,11 +22,10 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
+@Api(tags = "閲囪喘閫�璐у崟")
+@AllArgsConstructor
public class PurchaseReturnOrdersController {
- @Autowired
private PurchaseReturnOrdersService purchaseReturnOrdersService;
-
- @Autowired
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
@@ -40,8 +39,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.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