From b93148ba8b102ff62e2aef96085d3a0a9157100b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 3 Jan 2025 07:53:14 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisWaybillServiceImpl.java | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 56dfc5dd0..d11177d73 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
@@ -308,6 +308,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         queryCargo.setWaybillId(dbEmisWaybill.getId());
         List<EmisWaybillCargo> dbCargoList=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
 
+        // 快递单证商品资料
+        EmisWaybillDeclareGoods queryDeclareGoods = new EmisWaybillDeclareGoods();
+        queryDeclareGoods.setWaybillId(dbEmisWaybill.getId());
+        List<EmisWaybillDeclareGoods> dbDeclareGoodsList=emisWaybillDeclareGoodsMapper.selectEmisWaybillDeclareGoodsList(queryDeclareGoods);
+
+        // 陆运单证商品资料
+        List<EmisWaybillDeclareAttachment> dbDeclareAttachmentList=emisWaybillDeclareAttachmentMapper.selectAttachmentListByBillCode(dbEmisWaybill.getBillCode());
+
+
         // 附件清单
         List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectAttachmentListByBillCode(dbEmisWaybill.getBillCode());
         String goodsImgBmk="";
@@ -336,7 +345,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         dbEmisWaybill.setBillPicDispatchRmk(signImgBmk);
         dbEmisWaybill.setBillPicSendRmk(gotImgBmk);
 
-        return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
+        return WaybillOrder.toVo(
+                dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList,
+                dbDeclareGoodsList,
+                dbDeclareAttachmentList
+                );
 
     }