From e9364e13d9572168fdff883725188fbcca52cb30 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 27 二月 2026 14:41:55 +0800
Subject: [PATCH] 修复入库取消任务无库位报错

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 518c0f0..05062b0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1358,15 +1358,14 @@
         if (locNo != null) {
             if (wrkMast.getIoType() != 3) {
                 LocMast locMast = locMastService.selectById(locNo);
-                if (Cools.isEmpty(locMast)) {
-                    throw new CoolException("鍙栨秷宸ヤ綔妗eけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
-                }
-                locMast.setLocSts(locSts);
-                locMast.setModiTime(now);
-                locMast.setModiUser(userId);
-                boolean locMastRes = locMastService.updateById(locMast);
-                if (!wrkMastRes || !locMastRes) {
-                    throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+                if(locMast != null) {
+                    locMast.setLocSts(locSts);
+                    locMast.setModiTime(now);
+                    locMast.setModiUser(userId);
+                    boolean locMastRes = locMastService.updateById(locMast);
+                    if (!wrkMastRes || !locMastRes) {
+                        throw new CoolException("淇濆瓨鏁版嵁澶辫触");
+                    }
                 }
             }
         }

--
Gitblit v1.9.1