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-19 11:02:00 +08:00
parent d0ecfd5db4
commit 284e1ac289
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,6 +263,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
@ -288,6 +289,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
@ -318,6 +320,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
@ -359,6 +362,7 @@ public class EmisBaseService {
} }
} else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) { } else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) {
// 现金额度占用 // 现金额度占用
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getPayee(),oldBill.getSendDate(),oldBill.getTransType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getPayee(),oldBill.getSendDate(),oldBill.getTransType());
if (creditSalesmen!=null) { if (creditSalesmen!=null) {
@ -392,6 +396,7 @@ public class EmisBaseService {
} }
} else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) { } else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) {
// 现金额度占用 // 现金额度占用
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getTransType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getTransType());
if (creditSalesmen!=null) { if (creditSalesmen!=null) {
EmisCreditSalesmen item0 = creditSalesmen; EmisCreditSalesmen item0 = creditSalesmen;
@ -426,14 +431,15 @@ public class EmisBaseService {
/** /**
* 现金额度占用 * 现金额度占用
* @param salesmen * bug:1415 统计数据由销售联系人更改为回款联系人
* @param payee
* @param sendDate * @param sendDate
* @param transType * @param transType
* @return * @return
*/ */
public EmisCreditSalesmen getEmisCreditSalesmenByCond(String salesmen,Date sendDate,String transType){ public EmisCreditSalesmen getEmisCreditSalesmenByCond(String payee,Date sendDate,String transType){
EmisCreditSalesmen queryCreditSalesmen = new EmisCreditSalesmen(); EmisCreditSalesmen queryCreditSalesmen = new EmisCreditSalesmen();
queryCreditSalesmen.setSalesmen(salesmen); queryCreditSalesmen.setSalesmen(payee);
queryCreditSalesmen.getParams().put("sendDate", sendDate); queryCreditSalesmen.getParams().put("sendDate", sendDate);
queryCreditSalesmen.setTransType(transType); queryCreditSalesmen.setTransType(transType);
queryCreditSalesmen.setBlOpen("1"); queryCreditSalesmen.setBlOpen("1");
@ -1484,6 +1490,7 @@ public class EmisBaseService {
*/ */
public void autoDoCredit() { public void autoDoCredit() {
// 计算销售员额度 // 计算销售员额度
// bug:1415 统计数据由销售联系人更改为回款联系人
EmisCreditSalesmen querySalesmen = new EmisCreditSalesmen(); EmisCreditSalesmen querySalesmen = new EmisCreditSalesmen();
List<EmisCreditSalesmen> listSalemen = emisCreditSalesmenMapper.selectEmisCreditSalesmenList(querySalesmen); List<EmisCreditSalesmen> listSalemen = emisCreditSalesmenMapper.selectEmisCreditSalesmenList(querySalesmen);
if(!CollectionUtil.isEmpty(listSalemen)){ if(!CollectionUtil.isEmpty(listSalemen)){