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 1edfaacf4..238fd9d51 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
@@ -828,7 +828,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             // 货物不在当前网点不允许扫描
             if(!getCurrentUser().getOwnerSiteCode().equals(emisWaybill.getCurrentSiteCode())){
                 scanResultItem.setResult("fail");
-                scanResultItem.setMessage("货物不在当前网点");
+                scanResultItem.setMessage("运单不在当前网点");
                 scanResultItem.setErrorCode(EmisBizErrorType.SCAN_HAS_PACK.errorCode);
                 itemList.add(scanResultItem);
                 return itemList;
@@ -868,6 +868,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             emisTmsScanRecord.setOrderSn(emisWaybill.getOrderSn());
             emisTmsScanRecord.setWeight(emisWaybill.getBillWeight());
 
+            // 获取下一网点
+            EmisSite site=getSiteByCode(preOrNextStationCode);
+            emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
+            emisTmsScanRecord.setPreOrNextStation(site.getSiteName());
+            emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
+
             emisTmsScanRecord.setScanType(ScanType.CO_PACKING.opCode);
             emisTmsScanRecord.setScanDate(scanDate);
             emisTmsScanRecord.setBagNo(packNo);
@@ -891,6 +897,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             emisTmsPackDtl.setScanMan(emisTmsScanRecord.getScanManCode());
             emisTmsPackDtlMapper.insertEmisTmsPackDtl(emisTmsPackDtl);
 
+            // 下一站点
+            changeWaybillNextSite(emisTmsScanRecord.getMainBillCode(),preOrNextStationCode);
+
             // 修改主运单状态,子单做合包扫描，主单不变化
 //            this.changeWaybillStatus(mainBillCode, ScanType.CO_PACKING.opCode);
             scanResultItem.getData().put("billWeight", emisWaybill.getBillWeight());