From 5ed564bddc6aecb049509d9524190b3704f87d3d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 17 八月 2026 22:10:20 +0800
Subject: [PATCH] fix: 供应商与客户往来修改
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 293566a..393de76 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.basic.pojo.CustomerUser;
import com.ruoyi.basic.service.*;
import com.ruoyi.basic.vo.CustomerVo;
+import com.ruoyi.common.utils.AmountUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -400,10 +401,11 @@
vo.setShippedAmount(outboundAmount);
BigDecimal contractAmounts = vo.getContractAmounts() == null ? BigDecimal.ZERO : vo.getContractAmounts();
BigDecimal unshippedAmount = contractAmounts.subtract(outboundAmount);
- if (unshippedAmount.compareTo(BigDecimal.ZERO) < 0) {
+ if (unshippedAmount.compareTo(BigDecimal.ONE) < 0) {
unshippedAmount = BigDecimal.ZERO;
}
vo.setUnshippedAmount(unshippedAmount);
+ AmountUtils.normalizeCustomerTransaction(vo);
}
}
return p;
@@ -427,10 +429,11 @@
vo.setShippedAmount(outboundAmount);
BigDecimal contractAmount = vo.getContractAmount() == null ? BigDecimal.ZERO : vo.getContractAmount();
BigDecimal unshippedAmount = contractAmount.subtract(outboundAmount);
- if (unshippedAmount.compareTo(BigDecimal.ZERO) < 0) {
+ if (unshippedAmount.compareTo(BigDecimal.ONE) < 0) {
unshippedAmount = BigDecimal.ZERO;
}
vo.setUnshippedAmount(unshippedAmount);
+ AmountUtils.normalizeCustomerTransactionDetail(vo);
}
}
return p;
--
Gitblit v1.9.3