From 00a6376e31fea643df9394a90aaf71b8369fd01f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 16:37:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OutController.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 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 972d79c..c196404 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -90,6 +90,16 @@
                         locDto.setFrozen(locDetl.getFrozen());
                         locDto.setFrozenLoc(locMast.getFrozen());
                         List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 107);
+                        locDto.setBrand(orderDetl.getBrand());
+                        locDto.setStandby1(orderDetl.getStandby1());
+                        locDto.setStandby2(orderDetl.getStandby2());
+                        locDto.setStandby3(orderDetl.getStandby3());
+                        locDto.setBoxType1(orderDetl.getBoxType1());
+                        locDto.setBoxType2(orderDetl.getBoxType2());
+                        locDto.setBoxType3(orderDetl.getBoxType3());
+                        locDto.setWeight(orderDetl.getWeight());
+                        locDto.setUnit(orderDetl.getUnit());
+
                         locDto.setStaNos(staNos);
                         locDtos.add(locDto);
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
@@ -100,6 +110,16 @@
                 }
                 if (issued > 0) {
                     LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+                    locDto.setBrand(orderDetl.getBrand());
+
+                    locDto.setStandby1(orderDetl.getStandby1());
+                    locDto.setStandby2(orderDetl.getStandby2());
+                    locDto.setStandby3(orderDetl.getStandby3());
+                    locDto.setBoxType1(orderDetl.getBoxType1());
+                    locDto.setBoxType2(orderDetl.getBoxType2());
+                    locDto.setBoxType3(orderDetl.getBoxType3());
+                    locDto.setWeight(orderDetl.getWeight());
+                    locDto.setUnit(orderDetl.getUnit());
                     locDto.setLack(Boolean.TRUE);
                     locDtos.add(locDto);
                 }
@@ -121,6 +141,16 @@
                         locDto.setFrozenLoc(locMast.getFrozen());
                         List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                         locDto.setStaNos(staNos);
+                        locDto.setBrand(orderDetl.getBrand());
+
+                        locDto.setStandby1(orderDetl.getStandby1());
+                        locDto.setStandby2(orderDetl.getStandby2());
+                        locDto.setStandby3(orderDetl.getStandby3());
+                        locDto.setBoxType1(orderDetl.getBoxType1());
+                        locDto.setBoxType2(orderDetl.getBoxType2());
+                        locDto.setBoxType3(orderDetl.getBoxType3());
+                        locDto.setWeight(orderDetl.getWeight());
+                        locDto.setUnit(orderDetl.getUnit());
                         locDtos.add(locDto);
                         exist.add(locDetl.getLocNo());
                         // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
@@ -131,6 +161,15 @@
                 }
                 if (issued > 0) {
                     LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+                    locDto.setBrand(orderDetl.getBrand());
+                    locDto.setStandby1(orderDetl.getStandby1());
+                    locDto.setStandby2(orderDetl.getStandby2());
+                    locDto.setStandby3(orderDetl.getStandby3());
+                    locDto.setBoxType1(orderDetl.getBoxType1());
+                    locDto.setBoxType2(orderDetl.getBoxType2());
+                    locDto.setBoxType3(orderDetl.getBoxType3());
+                    locDto.setWeight(orderDetl.getWeight());
+                    locDto.setUnit(orderDetl.getUnit());
                     locDto.setLack(Boolean.TRUE);
                     locDtos.add(locDto);
                 }

--
Gitblit v1.9.1