From c15e67c83394c1734eb4e9802d8f343c6076efc1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 16:16:45 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 15 +++++++++++++--
1 files changed, 13 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 8d0a942..bb669b6 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -8,9 +8,13 @@
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,7 +26,7 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
-@Api(tags = "閲囪喘閫�璐у崟")
+@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
public class PurchaseReturnOrdersController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
@@ -56,5 +60,12 @@
return AjaxResult.success();
}
+ @GetMapping("/getByPurchaseLedgerId")
+ @Operation(summary = "閲囪喘閫�璐�-鏍规嵁閲囪喘璁㈠崟id鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勫叆搴撲骇鍝佷俊鎭�")
+ public AjaxResult getByPurchaseLedgerId(Long purchaseLedgerId) {
+ List<PurchaseStockInProductVo> purchaseStockInProductVos = purchaseReturnOrdersService.getByPurchaseLedgerId(purchaseLedgerId);
+ return AjaxResult.success(purchaseStockInProductVos);
+ }
+
}
--
Gitblit v1.9.3