From 6ed35b33aaad4c58568c3a530e96eaa21096fc2a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 May 2024 00:12:44 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   |  8 ++++-
 .../erp/emis/service/IEmisWaybillService.java |  2 ++
 .../service/impl/EmisWaybillServiceImpl.java  | 33 +++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

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 fc40a39d5..4c8cb1012 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
@@ -56,10 +56,11 @@ public class EmisWaybillController extends BaseController
      * 获取电子运单信息
      */
     @RequestMapping(value = "/getWaybillDetail")
-    public AjaxResult getWaybillDetail(@RequestParam("billCode")String billCode )
+    public AjaxResult getWaybillDetail(String billCode ,String orderSn)
     {
         try {
             WaybillOrder waybillOrder=null;
+
             if(StringUtils.isEmpty(billCode) ){
                 return AjaxResult.error("参数错误");
             }
@@ -69,6 +70,11 @@ public class EmisWaybillController extends BaseController
                 if(waybillOrder==null){
                     return AjaxResult.error("运单不存在");
                 }
+            }else if(!StringUtils.isEmpty(orderSn)){
+                waybillOrder = emisWaybillService.getWaybillDetailByOrderSn(orderSn);
+                if(waybillOrder==null){
+                    return AjaxResult.error("订单不存在");
+                }
             }
 
             return AjaxResult.success("获取成功",waybillOrder);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index 1cecf1c75..754cb184a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -100,6 +100,8 @@ public interface IEmisWaybillService
 
     public WaybillOrder getWaybillDetail(String billCode);
 
+    public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
+
 
     // 账单保存
     public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;
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 034eaa252..84053b063 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
@@ -163,9 +163,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         return emisWaybillMapper.deleteEmisWaybillById(id);
     }
 
-
-
-
     @Override
     public WaybillOrder getWaybillDetail(String billCode){
 
@@ -196,6 +193,36 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
 
+    @Override
+    public WaybillOrder getWaybillDetailByOrderSn(String orderSn){
+
+        EmisWaybill dbEmisWaybill = this.selectEmisWaybillByOrderSn(orderSn);
+        if(dbEmisWaybill==null){
+            return null;
+        }
+
+        // 收费项 // 查询收费项
+        EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
+        queryFeeitem.setWaybillId(dbEmisWaybill.getId());
+        List<EmisWaybillFeeitem> dbFeeItemList=emisWaybillFeeitemMapper.selectEmisWaybillFeeitemList(queryFeeitem);
+
+
+        // 货物清单
+        EmisWaybillCargo queryCargo = new EmisWaybillCargo();
+        queryCargo.setWaybillId(dbEmisWaybill.getId());
+        List<EmisWaybillCargo> dbCargoList=emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
+
+
+        // 附件清单
+        EmisWaybillAttachment queryAttachment = new EmisWaybillAttachment();
+        queryAttachment.setWaybillId(dbEmisWaybill.getId());
+        List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
+
+        return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
+
+    }
+
+
     /**
      * 下单接口
      * @param emisWaybillSave