From 9f1ec3d21f02d38d1a54876fface13301cc65fad Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 29 六月 2026 18:00:48 +0800
Subject: [PATCH] Merge branch 'dev_兴盛旺海' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_兴盛旺海
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index ec8bb26..a46d8de 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.AmountUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
@@ -171,6 +172,7 @@
vo.setShippedAmount(BigDecimal.ZERO);
BigDecimal contractAmount = vo.getContractAmounts() == null ? BigDecimal.ZERO : vo.getContractAmounts();
vo.setUnshippedAmount(contractAmount);
+ AmountUtils.normalizeSupplierTransaction(vo);
}
return plPage;
}
@@ -261,6 +263,7 @@
}
vo.setShippedAmount(shippedAmount);
vo.setUnshippedAmount(contractAmount.subtract(shippedAmount));
+ AmountUtils.normalizeSupplierTransaction(vo);
}
return plPage;
@@ -356,6 +359,7 @@
}
vo.setShippedAmount(shippedAmount);
vo.setUnshippedAmount(contractAmount.subtract(shippedAmount));
+ AmountUtils.normalizeSupplierTransactionDetail(vo);
}
return plPage;
--
Gitblit v1.9.3