From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk
---
src/main/java/com/zy/asrs/controller/OutController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 42ecb55..f38436c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -84,6 +84,10 @@
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