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-11 16:54:38 +08:00
parent dd4eaf7c6d
commit 21021e5b5a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,9 +220,8 @@ public class EmisBaseService {
*/ */
public void newUseQuotaCredit(EmisWaybill emisWaybill) throws EmisBizError { public void newUseQuotaCredit(EmisWaybill emisWaybill) throws EmisBizError {
String paymentType=emisWaybill.getPaymentType(); String paymentType=emisWaybill.getPaymentType();
EmisTransLine transLine = getTransLineByCode(emisWaybill.getTransLineType());
// 月结客户 // 月结客户
if("2".equals(paymentType) if("2".equals(paymentType)
|| "4".equals(paymentType) || "4".equals(paymentType)
|| "5".equals(paymentType) || "5".equals(paymentType)
@ -232,7 +231,7 @@ public class EmisBaseService {
EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer(); EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer();
queryCreditCustomer.setMonthlyPayCode(emisWaybill.getCustNo()); queryCreditCustomer.setMonthlyPayCode(emisWaybill.getCustNo());
queryCreditCustomer.getParams().put("sendDate",emisWaybill.getSendDate()); queryCreditCustomer.getParams().put("sendDate",emisWaybill.getSendDate());
queryCreditCustomer.setTransType(transLine.getTransType()); queryCreditCustomer.setTransType(emisWaybill.getTransType());
List<EmisCreditCustomer> listCreditCustomer=emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer); List<EmisCreditCustomer> listCreditCustomer=emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer);
if(!CollectionUtils.isEmpty(listCreditCustomer)){ if(!CollectionUtils.isEmpty(listCreditCustomer)){
@ -269,7 +268,7 @@ public class EmisBaseService {
EmisCreditSalesmen queryCreditSalesmen= new EmisCreditSalesmen(); EmisCreditSalesmen queryCreditSalesmen= new EmisCreditSalesmen();
queryCreditSalesmen.setSalesmen(emisWaybill.getSalesmen()); queryCreditSalesmen.setSalesmen(emisWaybill.getSalesmen());
queryCreditSalesmen.getParams().put("sendDate",emisWaybill.getSendDate()); queryCreditSalesmen.getParams().put("sendDate",emisWaybill.getSendDate());
queryCreditSalesmen.setTransType(transLine.getTransType()); queryCreditSalesmen.setTransType(emisWaybill.getTransType());
List<EmisCreditSalesmen> listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen); List<EmisCreditSalesmen> listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen);
if(!CollectionUtils.isEmpty(listCreditSalesmen)){ if(!CollectionUtils.isEmpty(listCreditSalesmen)){

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -2492,6 +2492,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
emisWaybillSave.setCarryType(emisTransLine.getTransType()); emisWaybillSave.setCarryType(emisTransLine.getTransType());
emisWaybillSave.setTransType(emisTransLine.getTransType());
// 计算标准运费 // 计算标准运费
List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList(); List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();
@ -2880,6 +2881,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType()); EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
emisWaybillSave.setMeterType(emisTransLine.getMeterRate()); emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
emisWaybillSave.setCarryType(emisTransLine.getTransType()); emisWaybillSave.setCarryType(emisTransLine.getTransType());
emisWaybillSave.setTransType(emisTransLine.getTransType());
// 计算标准运费 // 计算标准运费
List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList(); List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();