From ebc7bcfdf16fa29082ead891d9ca0c47c5e73d7d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 24 Jun 2024 21:19:50 +0800
Subject: [PATCH] md

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

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 b8636be1a..2302d81fe 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
@@ -544,6 +544,16 @@ 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("0095".equals(emisWaybill.getReceiveCountry())  ){
                 // 缅甸只允许主单