From 3001173ec71036a44fc09ff56ad1d9e2cd6d3d38 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 五月 2026 11:24:38 +0800
Subject: [PATCH] fix(procurement): 修正退货管理及销售台账字段和查询逻辑
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 9 +++++----
src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java | 2 +-
src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderProductsDetailVo.java | 2 +-
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml | 2 +-
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 4 ++--
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index dd250cf..b4701f6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -31,7 +31,6 @@
import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -75,15 +74,17 @@
@Override
public boolean updateReturnManagementDto(ReturnManagementDto returnManagementDto) {
- List<ReturnSaleProduct> returnSaleProducts = new ArrayList<>();
if (!CollectionUtils.isEmpty(returnManagementDto.getReturnSaleProducts())) {
returnManagementDto.getReturnSaleProducts().stream().forEach(returnSaleProductDto -> {
ReturnSaleProduct returnSaleProduct = new ReturnSaleProduct();
BeanUtils.copyProperties(returnSaleProductDto, returnSaleProduct);
- returnSaleProducts.add(returnSaleProduct);
+ if (returnSaleProductDto.getId() == null){
+ returnSaleProduct.setReturnManagementId(returnManagementDto.getId());
+ returnSaleProduct.setStatus(0);
+ returnSaleProductService.save(returnSaleProduct);
+ }else returnSaleProductService.updateById(returnSaleProduct);
});
}
- returnSaleProductService.updateBatchById(returnSaleProducts);
return updateById(returnManagementDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderProductsDetailVo.java b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderProductsDetailVo.java
index bf5891f..dcd58b5 100644
--- a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderProductsDetailVo.java
+++ b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderProductsDetailVo.java
@@ -18,7 +18,7 @@
private Long id;
@Schema(description = "閿�鍞彴璐︾殑浜у搧id")
- private Long saleLedgerProductId;
+ private Long salesLedgerProductId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
diff --git a/src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java b/src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java
index b6c1192..3f8e0ec 100644
--- a/src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java
+++ b/src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java
@@ -13,7 +13,7 @@
private Long id;
@Schema(description = "閿�鍞彴璐︾殑浜у搧id")
- private Long saleLedgerProductId;
+ private Long salesLedgerProductId;
@Schema(description = "浜у搧瑙勬牸id")
private Long productModelId;
diff --git a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
index 616e8a7..93bd879 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -32,7 +32,7 @@
LEFT JOIN (SELECT stock_out_record_id,
SUM(num) AS total_return_num
FROM return_sale_product
- WHERE 1 = 1 and return_management_id != #{returnManagementId}
+ WHERE 1 = 1 and return_management_id = #{returnManagementId}
GROUP BY stock_out_record_id) rs ON rs.stock_out_record_id = sor.id
where rm.id =#{returnManagementId}
</select>
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 06ffffe..a001e9a 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -88,7 +88,7 @@
SELECT
sir.id,
sir.product_model_id,
- slp.id saleLedgerProductId,
+ slp.id salesLedgerProductId,
slp.product_category,
slp.specification_model,
slp.unit,
@@ -141,7 +141,7 @@
LEFT JOIN (SELECT stock_in_record_id,
SUM(return_quantity) AS total_return_num
FROM purchase_return_order_products
- WHERE 1 = 1 and purchase_return_order_id != #{id}
+ WHERE 1 = 1 and purchase_return_order_id = #{id}
GROUP BY stock_in_record_id) rs ON rs.stock_in_record_id = sir.id
where pro.id = #{id}
</select>
--
Gitblit v1.9.3