From feb73feec3b720280d66776b9c04bd00052d5ee6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 30 Jul 2024 17:13:21 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisTmsScanRecordServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 230ab9e6d..82eaa4b57 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -968,13 +968,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             EmisWaybill emisWaybill = getWaybillByBillCode(mainBillCode);
 
             // 货物不在当前网点不允许扫描
-            if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
-                scanResultItem.setResult("fail");
-                scanResultItem.setMessage("运单不在当前网点");
-                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
-                itemList.add(scanResultItem);
-                return itemList;
-            }
+//            if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
+//                scanResultItem.setResult("fail");
+//                scanResultItem.setMessage("运单不在当前网点");
+//                scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
+//                itemList.add(scanResultItem);
+//                return itemList;
+//            }
 
             // 如果是缅甸允许主单扫描,主单和子单只能二选一
             if( "0095".equals(emisWaybill.getReceiveCountry()) ){