aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-14 16:14:51 +08:00
parent c00d89d4c2
commit 89c5ee7823
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -252,14 +252,17 @@ public class EmisBaseService {
if(changeMoney.compareTo(BigDecimal.ZERO)>0){
if("2".equals(newSettleType)){
EmisCreditCustomer creditCustomer = getEmisCreditCustomerByCond(newBill.getCustNo(),newBill.getSendDate(),newBill.getCarryType());
if(creditCustomer!=null) {
BigDecimal preBalance = creditCustomer.getCreditMoney().subtract(creditCustomer.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度");
}
}
}
else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
@ -268,19 +271,23 @@ public class EmisBaseService {
}
}
}
}
// 如果结算方式不同，需要判断新的
else{
BigDecimal changeMoney=newBill.getFreight();
if("2".equals(newSettleType)){
EmisCreditCustomer creditCustomer = getEmisCreditCustomerByCond(newBill.getCustNo(),newBill.getSendDate(),newBill.getCarryType());
if(creditCustomer!=null) {
BigDecimal preBalance = creditCustomer.getCreditMoney().subtract(creditCustomer.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度");
}
}
}
else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
@ -288,6 +295,7 @@ public class EmisBaseService {
}
}
}
}
}
// 新增情况
@ -299,14 +307,17 @@ public class EmisBaseService {
if(changeMoney.compareTo(BigDecimal.ZERO)>0){
if("2".equals(newSettleType)){
EmisCreditCustomer creditCustomer = getEmisCreditCustomerByCond(newBill.getCustNo(),newBill.getSendDate(),newBill.getCarryType());
if(creditCustomer!=null) {
BigDecimal preBalance = creditCustomer.getCreditMoney().subtract(creditCustomer.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
throw new EmisBizError(EmisBizErrorType.FAIL, "超出信用额度");
}
}
}
else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) {
// 提示异常
@ -317,6 +328,7 @@ public class EmisBaseService {
}
}
}
}
/**
*