From a9a8af3cd6e452cbcb8f8a046890cd5b36a61b17 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 21 八月 2024 10:34:39 +0800
Subject: [PATCH] 档查询出来有多条数据时,加上数量条件,进行匹配,如果数量也匹配不上,就默认返回第一个

---
 src/main/java/com/zy/asrs/controller/OutController.java |    6 +++---
 1 files changed, 3 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 ebb4acf..cf01421 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -88,9 +88,9 @@
             }
             List<LocDetl> locDetls;
             if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
-                locDetls = locDetlService.queryStockByModel(orderDetls.get(0).getModel());
+                locDetls = locDetlService.queryStockByModel(orderDetl.getModel());
             } else {
-                locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
+                locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
             }
             for (LocDetl locDetl : locDetls) {
                 if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
@@ -99,8 +99,8 @@
                                 issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                         List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                         locDto.setStaNos(staNos);
-                        locDtos.add(locDto);
                         locDto.setModel(locDetl.getModel());
+                        locDtos.add(locDto);
                         exist.add(locDetl.getLocNo());
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
                         issued = issued - locDetl.getAnfme();

--
Gitblit v1.9.1