From 08ae0d7ebfe352e8fbcd32a58c596b082a09ed15 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 16:40:15 +0800
Subject: [PATCH] feat(purchase): 添加根据采购订单id查询入库产品信息接口

---
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
index b5003ae..6e1d54e 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -25,6 +25,7 @@
 import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
 import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
 import com.ruoyi.purchase.vo.PurchaseReturnDetailsVo;
+import com.ruoyi.purchase.vo.PurchaseStockInProductVo;
 import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
 import com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto;
 import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -73,7 +74,7 @@
 
         if (!purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
             for (PurchaseReturnOrderProductsDto purchaseReturnOrderProductsDto : purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos()) {
-                purchaseReturnOrderProductsDto.setSalesLedgerProductId(purchaseReturnOrderProductsDto.getSalesLedgerProductId());
+                purchaseReturnOrderProductsDto.setProductModelId(purchaseReturnOrderProductsDto.getProductModelId());
                 purchaseReturnOrderProductsDto.setPurchaseReturnOrderId(purchaseReturnOrderDto.getId());
                 purchaseReturnOrderProductsDto.setReturnQuantity(purchaseReturnOrderProductsDto.getReturnQuantity());
                 // 杩欓噷涓烘柊澧炲洜姝d涓簄ull
@@ -81,7 +82,7 @@
                 purchaseReturnOrderProductsMapper.insert(purchaseReturnOrderProductsDto);
                 //搴撳瓨闇�瑕佸嚭搴�(閲囪喘閫�璐�)
                 PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseReturnOrderDto.getPurchaseLedgerId());
-                SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(purchaseReturnOrderProductsDto.getSalesLedgerProductId());
+                SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(purchaseReturnOrderProductsDto.getProductModelId());
                 stockUtils.substractStock(salesLedgerProduct.getProductModelId(), purchaseReturnOrderProductsDto.getReturnQuantity(), StockOutQualifiedRecordTypeEnum.PURCHASE_RETURN_STOCK_OUT.getCode(), purchaseReturnOrderDto.getId(), purchaseLedger.getPurchaseContractNumber()+"-"+salesLedgerProduct.getId());
             }
         }else {
@@ -147,4 +148,9 @@
         updateWrapperAccountIncome.eq(AccountIncome::getIncomeType, 4);
         accountIncomeService.remove(updateWrapperAccountIncome);
     }
+
+    @Override
+    public List<PurchaseStockInProductVo> getByPurchaseLedgerId(Long purchaseLedgerId) {
+        return purchaseReturnOrdersMapper.getByPurchaseLedgerId(purchaseLedgerId);
+    }
 }

--
Gitblit v1.9.3