diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 1233fef32..75c8e7aaf 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -11,6 +11,7 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -20,10 +21,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DBUtil;
-import com.xdadan.erp.emis.domain.vo.Reciever;
-import com.xdadan.erp.emis.domain.vo.Sender;
-import com.xdadan.erp.emis.domain.vo.WaybillOrder;
-import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
+import com.xdadan.erp.emis.domain.EmisWaybillCargo;
+import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
+import com.xdadan.erp.emis.domain.vo.*;
+import com.xdadan.erp.emis.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,7 +39,6 @@ import com.xdadan.erp.common.enums.BusinessType;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisWaybill;
-import com.xdadan.erp.emis.service.IEmisWaybillService;
 
 /**
  * 运单列表Controller
@@ -52,6 +53,15 @@ public class EmisWaybillController extends BaseController
     @Autowired
     private IEmisWaybillService emisWaybillService;
 
+    @Autowired
+    private IEmisWaybillFeeitemService emisWaybillFeeitemService;
+
+    @Autowired
+    private IEmisWaybillCargoService emisWaybillCargoService;
+
+    @Autowired
+    private IEmisWaybillAttachmentService emisWaybillAttachmentService;
+
     @Autowired
     private IEmisElectronicPagService emisElectronicPagService;
 
@@ -89,6 +99,7 @@ public class EmisWaybillController extends BaseController
                 return AjaxResult.error("未找到该运单");
             }
 
+            // 基础信息
             WaybillOrder waybillOrder = new WaybillOrder();
             waybillOrder.setBillCode(emisWaybill.getBillCode());
 
@@ -102,7 +113,62 @@ public class EmisWaybillController extends BaseController
             sender.setName(emisWaybill.getSendName());
             waybillOrder.setSender(sender);
 
-            waybillOrder.setBillCode("1232");
+//            @Autowired
+//            private IEmisWaybillFeeitemService emisWaybillFeeitemService;
+//
+//            @Autowired
+//            private IEmisWaybillCargoService emisWaybillCargoService;
+//
+//            @Autowired
+//            private IEmisWaybillAttachmentService emisWaybillAttachmentService;
+
+
+            // 收费项 // 查询收费项
+            List<FeeItem> feeItems = new ArrayList<>();
+            EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
+            queryFeeitem.setWaybillId(emisWaybill.getId());
+            List<EmisWaybillFeeitem> listFeeItem=emisWaybillFeeitemService.selectEmisWaybillFeeitemList(queryFeeitem);
+            for (EmisWaybillFeeitem feeItem:listFeeItem) {
+                FeeItem item = new FeeItem();
+                item.setFeeCode(feeItem.getFeeCode());
+                item.setFee(feeItem.getFee());
+                item.setOrderNum(feeItem.getOrderNum());
+                feeItems.add(item);
+            }
+            waybillOrder.setFeeItems(feeItems);
+
+            // 货物清单
+            List<Cargo> cargoList = new ArrayList<>();
+
+            EmisWaybillCargo queryCargo = new EmisWaybillCargo();
+            queryCargo.setWaybillId(emisWaybill.getId());
+            List<EmisWaybillCargo> listCargo=emisWaybillCargoService.selectEmisWaybillCargoList(queryCargo);
+            for (EmisWaybillCargo cargoItem:listCargo) {
+                Cargo item = new Cargo();
+                item.setGoodsCode(cargoItem.getGoodsCode());
+                item.setGoodsName(cargoItem.getGoodsName());
+                item.setCargoQty(cargoItem.getCargoQty());
+                cargoList.add(item);
+            }
+
+            waybillOrder.setCargoList(cargoList);
+
+
+            // 附件清单
+            List<Attachment> attachmentList = new ArrayList<>();
+            EmisWaybillAttachment queryAttachment = new EmisWaybillAttachment();
+            queryAttachment.setWaybillId(emisWaybill.getId());
+            List<EmisWaybillAttachment> listAttachment=emisWaybillAttachmentService.selectEmisWaybillAttachmentList(queryAttachment);
+            for (EmisWaybillAttachment attachmentItem:listAttachment) {
+                Attachment item = new Attachment();
+                item.setFileName(attachmentItem.getFileName());
+                item.setFileUrl(attachmentItem.getFileUrl());
+                item.setAttachType(attachmentItem.getAttachType());
+                item.setFileDesc(attachmentItem.getFileDesc());
+                item.setOrderNum(attachmentItem.getOrderNum());
+                attachmentList.add(item);
+            }
+            waybillOrder.setAttachmentList(attachmentList);
 
             return AjaxResult.success("获取成功",waybillOrder);
         }catch (Exception ex){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
index 3876493f0..db8ed3a5f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Attachment.java
@@ -1,5 +1,8 @@
 package com.xdadan.erp.emis.domain.vo;
 
+import lombok.Data;
+
+@Data
 public class Attachment {
 
     /* 附件类型 1-清关文件 2-揽收底单 3-签收底单 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
index 2d6f0a499..c23b373cd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/Cargo.java
@@ -1,5 +1,8 @@
 package com.xdadan.erp.emis.domain.vo;
 
+import lombok.Data;
+
+@Data
 public class Cargo {
     /* 货物编码 */
     private String goodsCode;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
index cdf151f48..0463507e9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java
@@ -1,7 +1,10 @@
 package com.xdadan.erp.emis.domain.vo;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 
+@Data
 public class FeeItem {
 
     /* 费用编码 */