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 8c111b91f..96852b82c 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
@@ -285,12 +285,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                             {
 
                                 // 货物不在当前网点不允许扫描
-                                if(!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())){
+                                if(
+                                        !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite())
+                                        && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getSendStiteCode())
+                                        && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode())
+
+                                ){
                                     ScanResultItem scanResultItem = new ScanResultItem();
                                     scanResultItem.setBillCode(scanBillCode);
                                     scanResultItem.setResult("fail");
                                     scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
-                                    scanResultItem.setMessage("合包不在当前网点");
+                                    scanResultItem.setMessage("合包不在发出网点或目的网点，不允许操作");
                                     itemList.add(scanResultItem);
                                     return itemList;
                                 }
@@ -1123,13 +1128,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;
+//            }
 
             // 生成扫描记录
             EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord();
@@ -1165,7 +1170,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             scanResultItem.setErrorCode(EmisBizErrorType.SUCCESS.errorCode);
             scanResultItem.setMessage("操作成功");
             itemList.add(scanResultItem);
-
         }
 
         // 更新合包信息