From ba957b5a448708294dead72c3c3b6f8932cc3f76 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 14:41:02 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml | 15 ++++++++++++++-
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 12 ++++++++----
src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java | 3 +++
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java b/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
index 539f3c7..79b4174 100644
--- a/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/bean/dto/ReturnManagementDto.java
@@ -36,4 +36,7 @@
@Schema(description = "閿�鍞骇鍝佸璞℃暟缁�")
private List<ReturnSaleProductDto> returnSaleProducts;
+ @Schema(description = "閿�鍞��璐у叆搴撳鎵圭姸鎬�")
+ private Integer stockInApprovalStatus;
+
}
diff --git a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
index e15e4aa..086f8a8 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -8,11 +8,24 @@
si.shipping_no,
sl.project_name,
sl.sales_contract_no,
- sl.salesman
+ sl.salesman,
+ CASE
+ WHEN tempA.approval_sum = tempA.total_approval THEN 1
+ WHEN tempA.approval_sum < tempA.total_approval AND tempA.approval_sum !=0 THEN 2
+ ELSE 0
+ END AS stock_in_approval_status
from return_management rm
left join shipping_info si on rm.shipping_id = si.id
left join customer c on rm.customer_id = c.id
left join sales_ledger sl on si.sales_ledger_id = sl.id
+ LEFT JOIN (
+ SELECT
+ rsp.return_management_id,
+ COUNT(sir.id) AS total_approval,
+ SUM(CASE WHEN sir.approval_status = 1 THEN 1 ELSE 0 END) AS approval_sum
+ FROM return_sale_product rsp LEFT JOIN stock_in_record sir ON rsp.id = sir.record_id
+ GROUP BY rsp.return_management_id
+ ) tempA ON tempA.return_management_id = rm.id
<where>
<if test="req.returnNo != null and req.returnNo != ''">
and rm.return_no like concat('%',#{req.returnNo},'%')
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 2d3be6a..7c4492a 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -116,10 +116,14 @@
GROUP BY si.sales_ledger_product_id
) t5 ON t5.sales_ledger_product_id = T1.id
LEFT JOIN (
- SELECT prop.sales_ledger_product_id, IFNULL(SUM(prop.return_quantity), 0) AS return_quantity
- FROM purchase_return_order_products prop
- INNER JOIN purchase_return_orders pro ON prop.purchase_return_order_id = pro.id
- GROUP BY prop.sales_ledger_product_id
+ SELECT
+ si.sales_ledger_product_id,
+ SUM( CASE WHEN rsp.STATUS = 1 AND sir.approval_status = 1 THEN rsp.num ELSE 0 END ) AS return_quantity
+ FROM shipping_info si
+ left join return_management rm on rm.shipping_id = si.id
+ left join return_sale_product rsp on rm.id = rsp.return_management_id
+ left join stock_in_record sir on rsp.id = sir.record_id
+ GROUP BY si.sales_ledger_product_id
) t6 ON t6.sales_ledger_product_id = T1.id
left join product_model pm ON T1.product_model_id = pm.id
left join product p ON pm.product_id = p.id
--
Gitblit v1.9.3