From b5cb83f31fbd0c1ee2d148851e2838d49912d2cd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 13:01:35 +0800
Subject: [PATCH] 销售退货新增页面基本信息加上发货类型下拉框,可选货车或者快递。货车 展示发货车牌号,选择快递则展示快递公司,快递单号。对应的列表也要加上相应的字段,采购退货也是一样加下

---
 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