From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/controller/OutController.java | 5 ++++-
1 files changed, 4 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 7a2569e..eb631b7 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -89,9 +89,12 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls;
+ List<LocDetl> locDetls = null;
if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
+ if (locDetls == null) {
+ locDetls = locDetlService.queryStock(orderDetl.getMatnr(), null, null, null);
+ }
} else {
locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
}
--
Gitblit v1.9.1