From 6c8588d5f7f0de7e9489426c350472bf911a4933 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 05 十二月 2025 15:47:07 +0800
Subject: [PATCH] towcs

---
 src/main/java/com/zy/asrs/controller/OutController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index eea546a..f38436c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -80,10 +80,14 @@
                 }
 
                 //鑾峰彇閫氶亾缁�
-                List<Integer> locRowGroupAsc = Utils.getLocRowGroupAsc(slaveProperties, Utils.getRow(locNo));
+                List<Integer> locRowGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
                 for (Integer row : locRowGroupAsc) {
                     String shallow = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                     LocMast shallowLoc = locMastService.selectById(shallow);
+                    if (shallowLoc == null) {
+                        continue;
+                    }
+
                     if (shallowLoc.getLocSts().equals("F")) {
                         LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", shallowLoc.getLocNo()));
                         if (locDetl1 == null) {

--
Gitblit v1.9.1