From 0904718894b24cb0f363d22ece082201298fea16 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 03 七月 2026 15:26:06 +0800
Subject: [PATCH] fix:1.销售退货状态更改 2.销售台账展示退货数量以及实际合同金额
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 9efcc89..f04417e 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -47,11 +47,18 @@
java.math.BigDecimal returnQuantity = item.getReturnQuantity() == null
? java.math.BigDecimal.ZERO
: item.getReturnQuantity();
- java.math.BigDecimal quantity = item.getQuantity() == null
+ item.setReturnQuantity(returnQuantity);
+ java.math.BigDecimal availableQuality = item.getQuantity() == null
? java.math.BigDecimal.ZERO
: item.getQuantity();
- item.setReturnQuantity(returnQuantity);
- item.setAvailableQuality(quantity.subtract(returnQuantity));
+ if (item.getType() != null && item.getType() == 2) {
+ availableQuality = item.getApprovedStockInNum() == null
+ ? java.math.BigDecimal.ZERO
+ : item.getApprovedStockInNum();
+ availableQuality = availableQuality
+ .subtract(item.getShippedQuantity() == null ? java.math.BigDecimal.ZERO : item.getShippedQuantity());
+ }
+ item.setAvailableQuality(availableQuality.subtract(returnQuantity));
});
}
return AjaxResult.success(list);
--
Gitblit v1.9.3