From 31259ec806275aa93ab547897c2fdb05a96bc5dc Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 28 May 2025 10:52:56 +0800
Subject: [PATCH] =?UTF-8?q?demand:TMS=E7=B3=BB=E7=BB=9F-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E9=99=90=E5=88=B6=EF=BC=9A=E5=AF=84=E4=BB=B6?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=92=8C=E7=9B=AE=E7=9A=84=E5=9B=BD=E5=AE=B6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=92=8C=E6=89=80=E9=80=89=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EmisWaybillServiceImpl.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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 05859f9b1..e1e85f073 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
@@ -1451,6 +1451,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 // 检查是否已锁单
                 checkDBBillIsLock(emisWaybillOld);
 
+                // 校验寄件国家是否匹配线路
+                checkCountry(emisWaybillSave);
+
                 emisWaybillSave.setId(emisWaybillOld.getId());
 
                 // 把历史发货日期带过来用于重新计算预估到到时间
@@ -3023,6 +3026,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL, "单号与子单号相同，请换单号");
         }
 
+        // 校验寄件国家是否匹配线路
+        checkCountry(emisWaybillSave);
+
         // 子单号做扣减
         if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
             Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");
@@ -3208,6 +3214,19 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
     }
 
+    private void checkCountry(EmisWaybill emisWaybillSave) throws EmisBizError {
+        EmisTransLine emisTransLine = new EmisTransLine();
+        emisTransLine.setLineCode(emisWaybillSave.getTransLineType());
+        List<EmisTransLine> emisTransLines = emisTransLineMapper.selectEmisTransLineList(emisTransLine);
+        if(CollectionUtil.isEmpty(emisTransLines)){
+            return;
+        }
+        if(emisWaybillSave.getSendCountry().equals(emisTransLines.get(0).getFromCountry())){
+            return;
+        }
+        throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "寄件国家与所选线路不匹配" );
+    }
+
 
     public int bindSalesmen(String empCode,String customerCode) throws EmisBizError {