From 76d0b1045cc56aab930b072aa56c36aefdc23c3c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Apr 2024 18:26:34 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/service/EmisBaseService.java | 2 ++
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 8a862b478..28156f98c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -121,6 +121,8 @@ public class EmisBaseService {
              return list.get(0);
          }
 
+         return null;
+
      }
 
      /**
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 bc5e68d68..ece06aa5c 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
@@ -449,6 +449,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                     }
                 }
             }
+            else if("3".equals(calcFeeType)){
+
+            }
         }
 
         // 设置费用明细