From efb7f3ac8bd451882011410e5d3b5c90c92772d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:44:41 +0800
Subject: [PATCH] 新增堆垛机有出库任务时禁止拣料回库agv搬运

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index a2dea81..31ac504 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -59,7 +59,7 @@
     @Override
     public void checkComplete(String orderNo) {
         Order order = this.selectByNo(orderNo);
-        if (order.getSettle() >= 4L) {
+        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
             return;
         }
         List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));

--
Gitblit v1.9.1