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 65b8fe3fb..bb3efe396 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
@@ -2872,8 +2872,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode();
         }
 
-
-
         try {
             Map<String,Object> scanDateItem = new HashMap<>();
             scanDateItem.put("billCode",emisWaybillSave.getBillCode());
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 4d096f85e..28137d650 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -220,6 +220,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                     and ewb.into_warehouse_code=#{params.privSiteCode}
                 </if>
+
+                <if test="params.intoWarehouseCode != null and params.intoWarehouseCode != ''">
+                    and ewb.into_warehouse_code=#{params.intoWarehouseCode}
+                </if>
             )
 
             <if test="params.blUploadGoodsPic != null and params.blUploadGoodsPic == 1">