From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 8d0a942..f1fb4e8 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -4,13 +4,18 @@
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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
-import io.swagger.annotations.Api;
+import com.ruoyi.purchase.vo.PurchaseStockInProductVo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -22,38 +27,45 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
-@Api(tags = "閲囪喘閫�璐у崟")
+@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
-public class PurchaseReturnOrdersController {
+public class PurchaseReturnOrdersController extends BaseController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
- return AjaxResult.success(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
+ public R<?> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ return R.ok(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
}
// 鏂板
@Log(title = "閲囪喘閫�璐у崟", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
+ public R<?> add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL", "no"));
}
- return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
+ return R.ok(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
@GetMapping("/selectById/{id}")
- public AjaxResult selectById(@PathVariable Long id) {
- return AjaxResult.success(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
+ public R<?> selectById(@PathVariable Long id) {
+ return R.ok(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
}
@PostMapping("/deleteById/{id}")
- public AjaxResult deleteById(@PathVariable Long id) {
+ public R<?> deleteById(@PathVariable Long id) {
purchaseReturnOrdersService.deleteById(id);
- return AjaxResult.success();
+ return R.ok();
+ }
+
+ @GetMapping("/getByPurchaseLedgerId")
+ @Operation(summary = "閲囪喘閫�璐�-鏍规嵁閲囪喘璁㈠崟id鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勫叆搴撲骇鍝佷俊鎭�")
+ public R<?> getByPurchaseLedgerId(Long purchaseLedgerId) {
+ List<PurchaseStockInProductVo> purchaseStockInProductVos = purchaseReturnOrdersService.getByPurchaseLedgerId(purchaseLedgerId);
+ return R.ok(purchaseStockInProductVos);
}
--
Gitblit v1.9.3