From 850b193934332d12ae1894741c70e7e9f8192b0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 四月 2021 14:58:14 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index f0c48c5..66a60f2 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -770,12 +770,13 @@
                     }
                     for (String number : existNumbers) {
                         Order order = orderService.selectByOrderNo(number);
-                        if (order.getSettle() != 3L && order.getSettle() != 5L) {
-                            if (!orderService.updateSettle(number, 5L)) {
+                        if (order != null) {
+                            if (order.getSettle() != 3L && order.getSettle() != 5L) {
+                                if (!orderService.updateSettle(number, 5L)) {
 //                            throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+                                }
                             }
                         }
-
                     }
 
                 }

--
Gitblit v1.9.1