diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index 2fdef836b..80343b7d4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -116,7 +116,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     // 转件登记
     public int updateTransferInfo(EmisWaybill emisWaybill);
 
-    public int checkWaybillIsExists(@Param("billCode")String billCode);
+    public int checkWaybillIsExists(@Param("billCode")String billCode,@Param("childSeqNo") String childSeqNo);
 
     public int checkWaybillIsSign(@Param("billCode")String billCode);
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 34aabf53a..253254176 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1403,7 +1403,7 @@ public class EmisBaseService {
       * @param billCode
       * @return
       */
-     public boolean checkWaybillIsExists(String billCode){
+     public boolean checkWaybillIsExists(String billCode,Integer childNum){
         return emisWaybillMapper.checkWaybillIsExists(billCode)==1;
      }
 
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 1f92a9a3e..1a09fea16 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
@@ -274,6 +274,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             throw  new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"扫描单号必填");
         }
 
+
+
+
         billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr);
         String[] billCodeArr = billCodeInStr.split(",");
 
@@ -480,6 +483,15 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"合包重量不能为0");
         }
 
+        String preOrNextStationCode = MapUtils.getString(scanDataItem,"preOrNextStationCode",null);
+        if(StringUtils.isEmpty(preOrNextStationCode)) {
+            throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"下一站必填");
+        }
+
+        // 判断是否必拆，不同国家必拆
+        boolean blUnPack=false;
+        Map countryMap = new HashMap();
+
         // 子单号处理
         for (String scanBillCode : billCodeArr) {
             // 返回原始数据返回
@@ -583,6 +595,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         emisTmsPack.setTotalWeight(scanWeight);
         emisTmsPack.setTotalWaybillQty(mainBillMap.size());
         emisTmsPack.setTotalParcelQty(billCodeArr.length);
+        emisTmsPack.setPackStatus("1");
+        emisTmsPack.setPrintStatus("1");
+        emisTmsPack.setSendStiteCode(getCurrentUser().getOwnerSiteCode());
+        emisTmsPack.setNextSiteCode(preOrNextStationCode);
+        emisTmsPack.setPackDate(scanDate);
+        emisTmsPack.setPackName(getCurrentUser().getOwnerSiteName()+"组包:"+packNo);
 
         int eCnt=emisTmsPackMapper.checkUnique(emisTmsPack);
         if(eCnt>0){
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9e800bc4d..53d7bdb73 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -232,9 +232,14 @@
         group by waybill_status
     </select>
 
-    <!--  检查运单号是否已存在 -->
-    <select id="checkWaybillIsExists" parameterType="String" resultType="int">
-        select count(1) as cnt from emis_waybill where bill_code=#{billCode} limit 1
+    <!--  检查运单号及子单号是否存在 -->
+    <select id="checkWaybillIsExists" resultType="int">
+        select count(1) as cnt from emis_waybill
+          where bill_code=#{billCode}
+            <if test="childSeqNo != null  and childSeqNo != ''">
+                and waybill_status=#{waybillStatus}
+            </if>
+          limit 1
     </select>
 
     <!--  检查运单号是否签收 -->