From 21021e5b5a0f3bfdcfc06f6d005dd09c4246120d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 11 Mar 2025 16:54:38 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java  | 7 +++----
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java      | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 1b9a63a48..910ceef21 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -220,9 +220,8 @@ public class EmisBaseService {
       */
      public void newUseQuotaCredit(EmisWaybill emisWaybill) throws EmisBizError {
              String paymentType=emisWaybill.getPaymentType();
-             EmisTransLine transLine = getTransLineByCode(emisWaybill.getTransLineType());
 
-         // 月结客户
+             // 月结客户
              if("2".equals(paymentType)
                      || "4".equals(paymentType)
                      || "5".equals(paymentType)
@@ -232,7 +231,7 @@ public class EmisBaseService {
                  EmisCreditCustomer queryCreditCustomer = new EmisCreditCustomer();
                  queryCreditCustomer.setMonthlyPayCode(emisWaybill.getCustNo());
                  queryCreditCustomer.getParams().put("sendDate",emisWaybill.getSendDate());
-                 queryCreditCustomer.setTransType(transLine.getTransType());
+                 queryCreditCustomer.setTransType(emisWaybill.getTransType());
                  List<EmisCreditCustomer> listCreditCustomer=emisCreditCustomerMapper.selectEmisCreditCustomerList(queryCreditCustomer);
 
                  if(!CollectionUtils.isEmpty(listCreditCustomer)){
@@ -269,7 +268,7 @@ public class EmisBaseService {
                  EmisCreditSalesmen queryCreditSalesmen= new EmisCreditSalesmen();
                  queryCreditSalesmen.setSalesmen(emisWaybill.getSalesmen());
                  queryCreditSalesmen.getParams().put("sendDate",emisWaybill.getSendDate());
-                 queryCreditSalesmen.setTransType(transLine.getTransType());
+                 queryCreditSalesmen.setTransType(emisWaybill.getTransType());
                  List<EmisCreditSalesmen> listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen);
 
                  if(!CollectionUtils.isEmpty(listCreditSalesmen)){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 9ca858613..16bd5cd38 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2492,6 +2492,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
         emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
         emisWaybillSave.setCarryType(emisTransLine.getTransType());
+        emisWaybillSave.setTransType(emisTransLine.getTransType());
 
         // 计算标准运费
         List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();
@@ -2880,6 +2881,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         EmisTransLine emisTransLine = getTransLineByCode(emisWaybillSave.getTransLineType());
         emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
         emisWaybillSave.setCarryType(emisTransLine.getTransType());
+        emisWaybillSave.setTransType(emisTransLine.getTransType());
 
         // 计算标准运费
         List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();