From ecd79ff570939b55f455767f2b310590faa5a191 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 22:13:01 +0800
Subject: [PATCH] 1.新增组托时批号必须唯一 2.新增当有出库任务时禁止AGV入库搬运 3.拣料下架从任务状态16改成34

---
 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