From e50218d4ba057a4a33af708ad13b8ef77c41e91c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 10:49:22 +0800
Subject: [PATCH] 订单追溯完善

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

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 60b2dec..5336d71 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -126,8 +126,8 @@
                 if (issued <= 0.0D) {
                     continue;
                 }
-                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
-                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+                List<LocDetl> locDetls = locDetlService.queryStockAllNew(null, exist,orderDetl.getMatnr(), orderDetl.getBatch()
+                        ,orderDetl.getModel(),orderDetl.getVolume());
                 for (LocDetl locDetl : locDetls) {
                     if (issued > 0) {
                         LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -138,6 +138,8 @@
                         List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                         locDto.setStaNos(staNos);
                         locDto.setBrand(orderDetl.getBrand());
+                        locDto.setModel(locDetl.getModel());
+                        locDto.setVolume(locDetl.getVolume());
 
                         locDto.setStandby1(orderDetl.getStandby1());
                         locDto.setStandby2(orderDetl.getStandby2());

--
Gitblit v1.9.1