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

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

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