From 2ff97f82d103ab4b1685caa38e73da1983d353f8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 31 May 2024 19:04:01 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   |  2 +-
 .../erp/emis/service/IEmisWaybillService.java | 55 +++++++++++++++----
 .../service/impl/EmisWaybillServiceImpl.java  | 28 ++++++----
 3 files changed, 64 insertions(+), 21 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 fb13e9495..4fc7edca2 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
@@ -101,7 +101,7 @@ public class EmisWaybillController extends BaseController
             }
 
             if(!StringUtils.isEmpty(billCode) ){
-                waybillOrder = emisWaybillService.getWaybillDetail(billCode);
+                waybillOrder = emisWaybillService.getWaybillDetailByBillCode(billCode);
                 if(waybillOrder==null){
                     return AjaxResult.error("运单不存在");
                 }
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 aff4f9a05..447ab9bd2 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,30 +100,65 @@ public interface IEmisWaybillService
     public int deleteEmisWaybillById(Long id);
 
 
-    public WaybillOrder getWaybillDetail(String billCode);
+    /**
+     * 获取运单信息 根据 billCode
+     * @param billCode
+     * @return
+     */
+    public WaybillOrder getWaybillDetailByBillCode(String billCode);
 
+    /**
+     * 获取运单信息 根据 orderSn
+     * @param orderSn
+     * @return
+     */
     public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
 
 
-
-
-
-    // 账单保存
+    /**
+     * 账单保存
+     * @param emisWaybill
+     * @return
+     * @throws EmisBizError
+     */
     public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;
 
-    // 费用试算
+    /**
+     * 费用试算
+     * @param emisWaybill
+     * @return
+     * @throws EmisBizError
+     */
     public List<Map> preCalcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError;
 
-    //计算运单费用
+
+    /**
+     * 计算运单费用
+     * @param emisWaybill
+     * @throws EmisBizError
+     */
     public void calcWaybillFee(EmisWaybill emisWaybill) throws EmisBizError;
 
-    // 计算体积重量
+
+    /**
+     * 计算体积重量
+     * @param emisWaybill
+     * @throws EmisBizError
+     */
     public void calcVolumeWeight(EmisWaybill emisWaybill) throws EmisBizError;
 
-    // 计算结算重量
+    /**
+     * 计算结算重量
+     * @param emisWaybill
+     * @throws EmisBizError
+     */
     public void calcSettledWeight(EmisWaybill emisWaybill) throws EmisBizError;
 
-
+    /**
+     * 获取多个运单
+     * @param billCodes
+     * @return
+     */
     public List<EmisWaybill> selectEmisWaybillByMutiBillCode(String[] billCodes);
 
 }
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 74ff6c3b3..3d4aba7c9 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
@@ -67,10 +67,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     private EmisTransLineMapper emisTransLineMapper;
 
 
-
-
     /**
-     * 精准查询 查询运单列表 by billCode
+     * 直接数据查询运单列表 by billCode
      *
      * @param billCode 运单列表主键
      * @return 运单列表
@@ -171,13 +169,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     }
 
     @Override
-    public WaybillOrder getWaybillDetail(String billCode){
+    public WaybillOrder getWaybillDetailByBillCode(String billCode){
 
         EmisWaybill dbEmisWaybill = this.selectEmisWaybillByBillCode(billCode);
         if(dbEmisWaybill==null){
             return null;
         }
 
+        // 设置运单锁单指令
+        boolean isLock=isWaybillLock(dbEmisWaybill);
+        if(isLock){
+            dbEmisWaybill.setLockFlag("T");
+        }else{
+            dbEmisWaybill.setLockFlag("F");
+        }
 
 
         // 收费项 // 查询收费项
@@ -211,6 +216,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             return null;
         }
 
+        // 设置运单锁单指令
+        boolean isLock=isWaybillLock(dbEmisWaybill);
+        if(isLock){
+            dbEmisWaybill.setLockFlag("T");
+        }else{
+            dbEmisWaybill.setLockFlag("F");
+        }
+
         // 收费项 // 查询收费项
         EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
         queryFeeitem.setWaybillId(dbEmisWaybill.getId());
@@ -229,12 +242,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
 
 
-        boolean isLock=isWaybillLock(dbEmisWaybill);
-        if(isLock){
-            dbEmisWaybill.setLockFlag("T");
-        }else{
-            dbEmisWaybill.setLockFlag("F");
-        }
+
 
 
         return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);