From 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:20:47 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/controller/OutController.java |   11 +++++++++++
 1 files changed, 11 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 7e6cea3..98fb66b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -75,6 +75,16 @@
             }
             LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
                     orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
+            LocDetl one = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
+            if (one == null) {
+                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", locDto.getBatch()));
+                if (locDetl == null) {
+                    locDto.setLocNo(null);
+                } else {
+                    locDto.setLocNo(locDetl.getLocNo());
+                }
+            }
+
             locDto.setOrderDetlId(orderDetl.getId());
             locDto.setTkType(orderDetl.getTkType());
             locDtos.add(locDto);
@@ -145,6 +155,7 @@
             Order order = orderService.selectByNo(locDto.getOrderNo());
 
             DocType docType = docTypeService.selectById(order.getDocType());
+
             if (docType.getDocName().equals("涓嶅悎鏍煎搧鍑哄簱")){
                 staNoOrder = 212;
             }

--
Gitblit v1.9.1