From 8eb4864f039281d5efeb7628f7e982cdbf579ca1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 22 Jun 2024 10:22:27 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 25 +++++++++++++++++++
 .../service/impl/EmisWaybillServiceImpl.java  | 19 +++++++++++---
 2 files changed, 41 insertions(+), 3 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 bdb0d90ff..becff5898 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
@@ -1098,6 +1098,26 @@ public class EmisBaseService {
      }
 
 
+     /**
+      * 根据月结客户名称获取月结客户编号
+      * @param name
+      * @return
+      */
+     public EmisCustomerUser getCustomerUserByName(String name){
+         if(StringUtils.isEmpty(name)){
+             return null;
+         }
+
+         EmisCustomerUser queryEmisCustomerUser = new EmisCustomerUser();
+         queryEmisCustomerUser.setCustomerName(name);
+         List<EmisCustomerUser> list=emisCustomerUserMapper.selectEmisCustomerUserList(queryEmisCustomerUser);
+         if(CollectionUtils.isEmpty(list)){
+             return null;
+         }
+         return list.get(0);
+     }
+
+
      /**
       * 获取打印信息
       * @param billCode
@@ -1779,6 +1799,11 @@ public class EmisBaseService {
       * @return
       */
      public EmisCountry getCountryByName(String name) {
+
+         if(StringUtils.isEmpty(name)){
+             return null;
+         }
+
          EmisCountry emisCountry = new EmisCountry();
          emisCountry.setName(name);
          List<EmisCountry> list=emisCountryMapper.selectEmisCountryList(emisCountry);
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 2e4ebae24..3203764f6 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
@@ -346,6 +346,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
         emisWaybillSave.setPaymentType(paymentType);
 
+        // 月结方式获取月结客户的编码和名称
+        if("2".equals(paymentType)
+            || "4".equals(paymentType)
+                || "5".equals(paymentType)
+        ){
+            EmisCustomerUser emisCustomerUser=getCustomerUserByMonthlyPayCode(emisWaybillSave.getCustNo());
+            emisWaybillSave.setCustomerCode(emisCustomerUser.getCustomerCode());
+            emisWaybillSave.setCustomerName(emisCustomerUser.getCustomerName());
+        }
+
+
         // 报关方式
         String customsEclaration=DictUtils.getDictValue("emis_declare_mode",emisWaybillSave.getCustomsEclaration());
         if(customsEclaration==null){
@@ -366,6 +377,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "找不到目的地");
         }
 
+        emisWaybillSave.setDestinationCode(destination.getDestCode());
+        emisWaybillSave.setDispatchUnderlingSiteCode(destination.getSiteCode());
+
+
         try {
             // 计算体积重量
             calcVolumeWeight(emisWaybillSave);
@@ -391,9 +406,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @return
      */
     private String getCountryCodeByName(String name){
-        if(StringUtils.isEmpty(name)){
-            return null;
-        }
+
 
         EmisCountry country=getCountryByName(name);
         if(country!=null){