From fb2d28c28a7805412e86bea1d02820b40ae57221 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 4 Sep 2024 17:38:59 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java  | 10 +++++++++-
 1 file changed, 9 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 b442e8ef7..a0f2c4ae8 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
@@ -3168,8 +3168,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 取重方式
         String carryType=emisTransProduct.getCarryType();
 
+
+
         // 获取特殊取重
-        EmisSpecialCalcWeight emisSpecialCalcWeight=getValidSpecialCalcWeight(emisTransProduct.getProdCode(),new Date(),BigDecimal.valueOf(maxWeight));
+        Date calcDate = emisWaybill.getSendDate();
+        if(calcDate==null){
+            calcDate=new Date();
+        }
+
+
+        EmisSpecialCalcWeight emisSpecialCalcWeight=getValidSpecialCalcWeight(emisTransProduct.getProdCode(),calcDate,BigDecimal.valueOf(maxWeight));
         if(emisSpecialCalcWeight!=null){
             carryType=emisSpecialCalcWeight.getCarryType();
         }