From f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 24 四月 2023 08:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs' into stasrs
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 450a109..baf969e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -349,7 +349,10 @@
Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
if (mastFinished) {
Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
- orderService.updateSettle(order.getId(),4L,1L);
+ if (!Cools.isEmpty(order)) {
+ orderService.updateSettle(order.getId(),4L,1L);
+
+ }
}
}
--
Gitblit v1.9.1