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 cb15f8acc..20ea14a40 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,27 +4058,29 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             /*1.根据模板生成文档*/
             String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8");
 
-            List<EmisWaybillCargo> cargoList = null;
+            List<EmisWaybillDeclareGoods> declareGoodsList = null;
 
             // 快递需要明细
             if("1".equals(emisTransLine.getTransType()) ){
                 // 货物清单 使用货物总览
-                EmisWaybillCargo queryCargo = new EmisWaybillCargo();
-                queryCargo.setWaybillId(emisWaybillOld.getId());
-                cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
+                EmisWaybillDeclareGoods queryDeclareGoods = new EmisWaybillDeclareGoods();
+                queryDeclareGoods.setWaybillId(emisWaybillOld.getId());
+                declareGoodsList=emisWaybillDeclareGoodsMapper.selectEmisWaybillDeclareGoodsList(queryDeclareGoods);
+
             }
             // 非快递不需要明细
             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);
+                declareGoodsList = new ArrayList<EmisWaybillDeclareGoods>();
+
+                EmisWaybillDeclareGoods cargoDeclareGoods = new EmisWaybillDeclareGoods();
+                cargoDeclareGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
+                cargoDeclareGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString())));
+                cargoDeclareGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString())));
+                cargoDeclareGoods.setLength(BigDecimal.ZERO);
+                cargoDeclareGoods.setWidth(BigDecimal.ZERO);
+                cargoDeclareGoods.setHeight(BigDecimal.ZERO);
+                cargoDeclareGoods.setCargoQty(BigDecimal.valueOf(emisWaybillOld.getParcelQty()));
+                declareGoodsList.add(cargoDeclareGoods);
             }
 
             // 生成条码
@@ -4135,7 +4137,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             fillMap.put("barcode", Pictures.ofBufferedImage(barcodeImageBuffer, PictureType.JPEG).size(width, height).create());
 
-            fillMap.put("cargoList", cargoList);
+            fillMap.put("cargoList", declareGoodsList);
 //            fillMap.put("cargoList", emisWaybillOld.getCargoList());
 
             // 生成模版