From 23398b405e37c75dfea32e26beb0cac787e0aa1b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 8 Jan 2025 16:07:56 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 11 +++++++++++
 1 file changed, 11 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 7268915c5..c3fe562f9 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
@@ -1424,6 +1424,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收，不允许取消");
         }
 
+        // 非当前网点不允许接其他网点的运单
+        if(!emisWaybillOld.getSendSiteCode().equals(getCurrentUser().getOwnerSiteCode())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"非当前网点运单，不允许操作！");
+        }
+
         emisWaybill.setBillCode(emisWaybillOld.getBillCode());
         return emisWaybillMapper.cancelOrder(emisWaybill);
     }
@@ -1452,6 +1457,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收,不允许再接单");
         }
 
+        // 非当前网点不允许接其他网点的运单
+        if(!oldEmisWaybill.getSendSiteCode().equals(getCurrentUser().getOwnerSiteCode())){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"非当前网点运单，请先指派到当前网点！");
+        }
+
+
         // 子单号做扣减
         if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
             Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");