diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
index 645ff07f8..2d59d3813 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
@@ -65,7 +65,6 @@ public class EmisWarehouseIn extends BaseEntity
     //   扩展参数
     private EmisWaybill waybillDetail;
 
-
     // 入仓批次信息
     private List<EmisWarehouseInBatch> stockInBatchList;
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
index d0f45a3f7..f0f311cc4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
@@ -88,8 +88,6 @@ public class EmisWarehouseInBatch extends BaseEntity
     /* 进仓图片链接 */
     private String picUrl;
 
-
-
     List<EmisWarehouseInDtl> cargoList;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
index 7d6f3113c..e7f9f136a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
@@ -36,6 +36,10 @@ public interface EmisWarehouseInBatchMapper extends BaseMapper<EmisWarehouseInBa
      */
     public List<EmisWarehouseInBatch> selectEmisWarehouseInBatchList(EmisWarehouseInBatch emisWarehouseInBatch);
 
+
+    public List<EmisWarehouseInBatch> selectInBatchListByInNo(String  inNo);
+
+
     /**
      * 新增 
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
index c21590d1b..17bacdb48 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
@@ -11,6 +11,8 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisWarehouseIn;
@@ -29,6 +31,9 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
     @Autowired
     private EmisWarehouseInMapper emisWarehouseInMapper;
 
+    @Autowired
+    private EmisWarehouseInBatchMapper emisWarehouseInBatchMapper;
+
     /**
      * 查询进仓单
      * 
@@ -44,7 +49,12 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
     @Override
     public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
     {
-        return emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
+        EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
+        if(emisWarehouseIn!=null){
+            emisWarehouseIn.setStockInBatchList(emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo));
+        }
+
+        return emisWarehouseIn;
     }
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
index f9f258834..79746bd89 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <select id="selectStockInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
+    <select id="selectInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
         select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in_batch a
         where del_flag='0' and a.in_no = #{inNo}
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 3958a7f73..c2c83fecf 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 <!--    <association property="stockInBatchList"-->
 <!--                 column="in_no"-->
-<!--                 select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectStockInBatchListByInNo"-->
+<!--                 select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectInBatchListByInNo"-->
 <!--                 fetchType="lazy"-->
 <!--    />-->