From 2c1f34d284e66e5973aa6817cda2856fbb06789e Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 13 八月 2024 14:56:37 +0800
Subject: [PATCH] 出库逻辑调整
---
src/main/java/com/zy/asrs/controller/OutController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 4a08e72..ebb4acf 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -83,10 +83,17 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls;
+ if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
+ locDetls = locDetlService.queryStockByModel(orderDetls.get(0).getModel());
+ } else {
+ locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
+ }
for (LocDetl locDetl : locDetls) {
- if (locDetl.getMatnr().equals(orderDetl.getMatnr())){
+ if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
--
Gitblit v1.9.1