From ebb64dba392193c2d821edfa8d07932d383453e9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 Jan 2025 15:39:09 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 c723fe94f..0c84bce27 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
@@ -1679,7 +1679,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         // 检查产品停用的不能下单
-        EmisTransProduct emisTransProduct=getTransProductByCode(emisWaybillSave.getProductType())
+        EmisTransProduct emisTransProduct=getTransProductByCode(emisWaybillSave.getProductType());
         if(emisTransProduct==null ){
             throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"产品已失效，请重新选择产品");
         }
@@ -1713,7 +1713,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"支付方式必填");
         }
 
-
+        // 产品时效
+        emisWaybillSave.setTimeType(emisTransProduct.getAgingDesc());
 
         if(StringUtils.isEmpty(emisWaybillSave.getCalcFeeType())){
             emisWaybillSave.setCalcFeeType("1");
@@ -1911,9 +1912,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybillSave.setMeterType(emisTransLine.getMeterRate());
         emisWaybillSave.setCarryType(emisTransLine.getTransType());
 
-        // 时效
-        EmisTransProduct emisTransProduct = getTransProductByCode(emisWaybillSave.getProductType());
-        emisWaybillSave.setTimeType(emisTransProduct.getAgingDesc());
+
 
         if(emisWaybillSave.getSendDate()==null){
             emisWaybillSave.setSendDate(new Date());