From 334aae31ed179571dab952a411fa3ac51cc6c895 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Apr 2024 08:51:13 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 c8b787251..62c051e60 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
@@ -221,8 +221,11 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
 
         // 判断运单状态，如果已锁账，则不允许修改
         // 下单超过 24小时
-        if( "1".equals(emisWaybillOld.getBlBill()) || isOutTime(emisWaybillOld.getCreateTime()) ) {
-            throw new Exception("已锁账，不允许修改");
+
+        if(emisWaybillOld!=null ) {
+            if ("1".equals(emisWaybillOld.getBlBill()) || isOutTime(emisWaybillOld.getCreateTime())) {
+                throw new Exception("已锁账，不允许修改");
+            }
         }
 
         EmisWaybill emisWaybillNew = waybillOrder.toDb();