diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
index 0cbb0bab1..a3302777e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
@@ -54,6 +54,7 @@ public class EmisWaybillCargo extends BaseEntity
     private BigDecimal weight;
     /* 货物单价 */
     private BigDecimal price;
+
     /* 货物币种 */
     private String currency;
     /* 原产国 */
@@ -99,5 +100,7 @@ public class EmisWaybillCargo extends BaseEntity
     private String billCode;
     private String orderSn;
 
+    // 扩展信息 货值
+    private BigDecimal realValue;
 
 }
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 0c84bce27..cb15f8acc 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
@@ -4058,23 +4058,28 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             /*1.根据模板生成文档*/
             String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8");
 
+            List<EmisWaybillCargo> cargoList = null;
 
-            // 货物清单 使用货物总览
-            EmisWaybillCargo queryCargo = new EmisWaybillCargo();
-//            queryCargo.setWaybillId(emisWaybillOld.getId());
-//            List<EmisWaybillCargo> cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
-            List<EmisWaybillCargo> cargoList = new ArrayList<EmisWaybillCargo>();
-
-            EmisWaybillCargo cargoGoods = new EmisWaybillCargo();
-//            [cargoQty]	[weight]	[volume]	[length]*[width]*[height]	[goodsName]
-            cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
-            cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString())));
-            cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString())));
-            cargoGoods.setLength(BigDecimal.ZERO);
-            cargoGoods.setWidth(BigDecimal.ZERO);
-            cargoGoods.setHeight(BigDecimal.ZERO);
-            cargoGoods.setCargoQty(emisWaybillOld.getParcelQty());
-            cargoList.add(cargoGoods);
+            // 快递需要明细
+            if("1".equals(emisTransLine.getTransType()) ){
+                // 货物清单 使用货物总览
+                EmisWaybillCargo queryCargo = new EmisWaybillCargo();
+                queryCargo.setWaybillId(emisWaybillOld.getId());
+                cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
+            }
+            // 非快递不需要明细
+            else {
+                cargoList = new ArrayList<EmisWaybillCargo>();
+                EmisWaybillCargo cargoGoods = new EmisWaybillCargo();
+                cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
+                cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString())));
+                cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString())));
+                cargoGoods.setLength(BigDecimal.ZERO);
+                cargoGoods.setWidth(BigDecimal.ZERO);
+                cargoGoods.setHeight(BigDecimal.ZERO);
+                cargoGoods.setCargoQty(emisWaybillOld.getParcelQty());
+                cargoList.add(cargoGoods);
+            }
 
             // 生成条码
             int width = 400;
diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx
index bcd823e0c..08f75adb8 100644
Binary files a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx differ