From 4f2b7db1184798a55046f04e17d5540b4a7e19f4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 11:12:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java
index ee06027..fc0b06c 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java
@@ -128,6 +128,10 @@
         if (Cools.isEmpty(sourceLoc) || Cools.isEmpty(sourceLoc.getBarcode())) {
             return null;
         }
+        Integer sourceCrnNo = sourceLoc.getCrnNo();
+        if (sourceCrnNo == null) {
+            return null;
+        }
 
         Integer runningCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                 .eq("barcode", sourceLoc.getBarcode())
@@ -139,7 +143,7 @@
         Integer targetCrnNo = null;
         Integer targetEmptyCount = null;
         for (int candidate = 1; candidate < 5; candidate++) {
-            if (candidate == crnNo) {
+            if (candidate == sourceCrnNo) {
                 continue;
             }
             Integer candidateEmpty = locMastService.selectCount(new EntityWrapper<LocMast>()
@@ -170,6 +174,9 @@
         if (Cools.isEmpty(targetLoc)) {
             return null;
         }
+        if (sourceCrnNo.equals(targetLoc.getCrnNo())) {
+            return null;
+        }
 
         List<Integer> sourceStaNos = staDescService.queryOutStaNosByLocNo(sourceLoc.getLocNo(), 101);
         if (Cools.isEmpty(sourceStaNos)) {

--
Gitblit v1.9.1