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 4e0591fe3..af517bcfc 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
@@ -1264,6 +1264,27 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //                emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
 //            }
 
+            // 揽收特殊情况
+
+            String scanManCode=MapUtils.getString(scanDataItem,"scanManCode",null);
+            String scanSiteCode=MapUtils.getString(scanDataItem,"scanSiteCode",null);
+
+            if(!StringUtils.isEmpty(scanManCode)){
+                SysUser staff = getEmisStaffByCode(scanManCode);
+                if(staff!=null){
+                    emisTmsScanRecord.setScanMan(staff.getEmpName());
+                    emisTmsScanRecord.setScanManCode(scanManCode);
+                }
+            }
+
+            if(!StringUtils.isEmpty(scanSiteCode)){
+                EmisSite site=getSiteByCode(scanSiteCode);
+                if(site!=null){
+                    emisTmsScanRecord.setScanSite(site.getSiteName());
+                    emisTmsScanRecord.setScanSiteCode(scanSiteCode);
+                }
+            }
+
             String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
 
             if(!StringUtils.isEmpty(dispatchOrSendManCode)) {
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 d7fea03e0..051bf77b0 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
@@ -1096,6 +1096,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         Map<String,Object> scanDateItem = new HashMap<>();
         scanDateItem.put("billCode",emisWaybillSave.getBillCode());
+        scanDateItem.put("scanSiteCode",emisWaybillSave.getSendSiteCode());
+        scanDateItem.put("scanManCode",dispatchOrSendManCode);
         scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);
         scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate()));
         scanDateItem.put("scanWeight", "0.0");