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 17bacdb48..ccfed9df2 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
@@ -10,16 +10,19 @@
 
 package com.xdadan.erp.emis.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
 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;
 import com.xdadan.erp.emis.mapper.EmisWarehouseInMapper;
 import com.xdadan.erp.emis.service.IEmisWarehouseInService;
+import org.springframework.util.CollectionUtils;
 
-/**
+ /**
  * 进仓单Service业务层处理
  * 
  * @author linfso
@@ -51,7 +54,35 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
     {
         EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
         if(emisWarehouseIn!=null){
-            emisWarehouseIn.setStockInBatchList(emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo));
+            List<EmisWarehouseInBatch> stockInBatchList= emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo);
+            emisWarehouseIn.setStockInBatchList(stockInBatchList);
+
+            /* 总件数 */
+            Integer totalParcelQty=0;
+            /* 总体积 */
+            BigDecimal totalVolume=BigDecimal.ZERO;
+            /* 总重量 */
+            BigDecimal totalWeight=BigDecimal.ZERO;
+            if(!CollectionUtils.isEmpty(stockInBatchList)){
+                for (EmisWarehouseInBatch item:stockInBatchList) {
+                    if(item.getTotalParcelQty()!=null) {
+                        totalParcelQty = totalParcelQty + item.getTotalParcelQty();
+                    }
+
+                    if(item.getTotalVolume()!=null) {
+                        totalVolume = totalVolume.add(item.getTotalVolume());
+                    }
+
+                    if(item.getTotalWeight()!=null) {
+                        totalWeight = totalWeight.add(item.getTotalWeight());
+                    }
+
+                }
+            }
+            emisWarehouseIn.setTotalParcelQty(totalParcelQty);
+            emisWarehouseIn.setTotalVolume(totalVolume);
+            emisWarehouseIn.setTotalWeight(totalWeight);
+
         }
 
         return emisWarehouseIn;