From e3b8af2072c27fd50274afbe048bc90fe8d0981c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 23 Oct 2024 11:40:38 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 22f04a9ab..39b54c104 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
@@ -2398,7 +2398,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         // 如果是孟加拉单子，把运单号变为 12位
-        if("0880".equals(emisWaybillSave.getReceiveCountry())){
+        if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){
             if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){
                 String str =emisWaybillSave.getBillCode();
                 String prefix=str.substring(0,6);
@@ -2556,7 +2556,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybillSave.setOrderType("0");
 
         // 如果是孟加拉单子，把运单号变为 12位
-        if("0880".equals(emisWaybillSave.getReceiveCountry())){
+        if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){
             if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){
                 String str =emisWaybillSave.getBillCode();
                 String prefix=str.substring(0,6);
@@ -2626,7 +2626,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     private void addNewWaybillByApi(EmisWaybill emisWaybillSave) throws EmisBizError {
 
         // 如果是孟加拉单子，把运单号变为 12位
-        if("0880".equals(emisWaybillSave.getReceiveCountry())){
+        if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){
             if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){
                 String str =emisWaybillSave.getBillCode();
                 String prefix=str.substring(0,6);