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:02:21 +08:00
parent 05f4014b9a
commit c00d89d4c2
3 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,6 +319,7 @@ public class EmisBaseService {
}
/**
*
* 重新计算使用信用额度
* @param oldBill
* @param newBill
@ -332,14 +333,10 @@ public class EmisBaseService {
|| "4".equals(oldPaymentType)
|| "5".equals(oldPaymentType)
) {
EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer();
queryCreditCustomer.setMonthlyPayCode(oldBill.getCustNo());
queryCreditCustomer.getParams().put("sendDate", oldBill.getSendDate());
queryCreditCustomer.setTransType(oldBill.getTransType());
List<EmisCreditCustomer> listCreditCustomer = emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer);
if (!CollectionUtils.isEmpty(listCreditCustomer)) {
EmisCreditCustomer item0 = listCreditCustomer.get(0);
EmisCreditCustomer creditCustomer = getEmisCreditCustomerByCond(newBill.getCustNo(),newBill.getSendDate(),newBill.getCarryType());
if (creditCustomer!=null) {
EmisCreditCustomer item0 = creditCustomer;
// 获取已使用金额
Map useMoneyMap=emisCreditCustomerMapper.getUseMoneyMap(item0);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
@ -351,15 +348,10 @@ public class EmisBaseService {
}
} else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) {
// 现金额度占用
EmisCreditSalesmen queryCreditSalesmen = new EmisCreditSalesmen();
queryCreditSalesmen.setSalesmen(oldBill.getSalesmen());
queryCreditSalesmen.getParams().put("sendDate", oldBill.getSendDate());
queryCreditSalesmen.setTransType(oldBill.getTransType());
queryCreditSalesmen.setBlOpen("1");
List<EmisCreditSalesmen> listCreditSalesmen = emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen);
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getSalesmen(),oldBill.getSendDate(),oldBill.getTransType());
if (!CollectionUtils.isEmpty(listCreditSalesmen)) {
EmisCreditSalesmen item0 = listCreditSalesmen.get(0);
if (creditSalesmen!=null) {
EmisCreditSalesmen item0 = creditSalesmen;
// 获取已使用金额
Map useMoneyMap=emisCreditSalesmenMapper.getUseMoneyMap(item0);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
@ -368,7 +360,6 @@ public class EmisBaseService {
upd.setId(item0.getId());
upd.setUseMoney(useMoney);
emisCreditSalesmenMapper.updateEmisCreditSalesmen(upd);
}
}
}
@ -380,14 +371,10 @@ public class EmisBaseService {
|| "4".equals(newPaymentType)
|| "5".equals(newPaymentType)
) {
EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer();
queryCreditCustomer.setMonthlyPayCode(newBill.getCustNo());
queryCreditCustomer.getParams().put("sendDate", newBill.getSendDate());
queryCreditCustomer.setTransType(newBill.getTransType());
List<EmisCreditCustomer> listCreditCustomer = emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer);
if (!CollectionUtils.isEmpty(listCreditCustomer)) {
EmisCreditCustomer item0 = listCreditCustomer.get(0);
EmisCreditCustomer creditCustomer = getEmisCreditCustomerByCond(newBill.getCustNo(),newBill.getSendDate(),newBill.getCarryType());
if (creditCustomer!=null) {
EmisCreditCustomer item0 = creditCustomer;
// 获取已使用金额
Map useMoneyMap=emisCreditCustomerMapper.getUseMoneyMap(item0);
@ -400,15 +387,9 @@ public class EmisBaseService {
}
} else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) {
// 现金额度占用
EmisCreditSalesmen queryCreditSalesmen = new EmisCreditSalesmen();
queryCreditSalesmen.setSalesmen(newBill.getSalesmen());
queryCreditSalesmen.getParams().put("sendDate", newBill.getSendDate());
queryCreditSalesmen.setTransType(newBill.getTransType());
queryCreditSalesmen.setBlOpen("1");
List<EmisCreditSalesmen> listCreditSalesmen = emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen);
if (!CollectionUtils.isEmpty(listCreditSalesmen)) {
EmisCreditSalesmen item0 = listCreditSalesmen.get(0);
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getTransType());
if (creditSalesmen!=null) {
EmisCreditSalesmen item0 = creditSalesmen;
// 获取已使用金额
Map useMoneyMap=emisCreditSalesmenMapper.getUseMoneyMap(item0);
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -793,11 +793,10 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
null,
"收款状态变更["+paymentStatusDesc+"]"
);
// 计算占用
try {
EmisWaybill oldBillA = getWaybillByBillCode(subBill.getBillCode());
adjustUseQuotaCredit(oldBillA,null);
reCalcUseQuotaCredit(oldBillA,null);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
}

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillProblemInfoServiceImpl.java
View File

@ -39,10 +39,6 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
@Autowired
private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
/**
* 查询问题件
*
@ -82,9 +78,6 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
// return emisWaybillProblemInfoMapper.insertEmisWaybillProblemInfo(emisWaybillProblemInfo);
// 使用问题件扫描接口做登记
return 1;
}
@ -137,7 +130,7 @@ public class EmisWaybillProblemInfoServiceImpl extends EmisBaseService implement
if(typeId == 173 || typeId == 170 || typeId == 151) {
try {
EmisWaybill oldEmisWaybill=getWaybillByBillCode(emisWaybillProblemInfo.getMainBillCode());
adjustUseQuotaCredit(oldEmisWaybill, null);
reCalcUseQuotaCredit(oldEmisWaybill, null);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
}