From e5fea5046658957eccf52d8e13fe81a9cb291f05 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 14 Aug 2026 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockInOrder/StockInOrderApplicationService.java   | 10 ++++++----
 .../stockOutOrder/StockOutOrderApplicationService.java | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index 62294a361..99e6dc2b8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -259,8 +259,10 @@ public class StockInOrderApplicationService {
                 .forEach(a -> invoiceNoByNum.merge(a.getInOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n));
 
         // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按入库单号分组挂到列表
+        //  注释掉 needDetail 判断：列表/导出统一返回明细
         Map<String, List<InMaterialDetailPO>> detailByNum = Collections.emptyMap();
-        if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(inOrderNumbers)) {
+        // if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(inOrderNumbers)) {
+        if (!CollectionUtils.isEmpty(inOrderNumbers)) {
             InMaterialDetailDO detailQuery = new InMaterialDetailDO();
             detailQuery.setInOrderNumberList(inOrderNumbers);
             List<InMaterialDetailPO> detailTreeList = inMaterialDetailService.queryListChildren(detailQuery);
@@ -272,9 +274,9 @@ public class StockInOrderApplicationService {
             if (invoiceNoByNum.containsKey(stockInOrderPO.getInOrderNumber())) {
                 stockInOrderPO.setInvoiceNo(invoiceNoByNum.get(stockInOrderPO.getInOrderNumber()));
             }
-            if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail())) {
-                stockInOrderPO.setMaterialDetailList(detailByNum.getOrDefault(stockInOrderPO.getInOrderNumber(), Collections.emptyList()));
-            }
+            // if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail())) {
+            stockInOrderPO.setMaterialDetailList(detailByNum.getOrDefault(stockInOrderPO.getInOrderNumber(), Collections.emptyList()));
+            // }
             Long inOrderId = stockInOrderPO.getInOrderId();
             List<ReceiptOrderAccount> list = receiptOrderAccountService.list(new LambdaQueryWrapper<ReceiptOrderAccount>().eq(ReceiptOrderAccount::getOrderId, inOrderId).eq(ReceiptOrderAccount::getInOrOut, "in"));
             stockInOrderPO.setReceiptOrderAccountList(list);
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index f3b4cda24..8762d34b0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -261,8 +261,10 @@ public class StockOutOrderApplicationService {
                 .forEach(a -> invoiceNoByNum.merge(a.getOutOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n));
 
         // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按出库单号分组挂到列表
+        // 注释掉 needDetail 判断：列表/导出统一返回明细
         Map<String, List<OutMaterialDetailPO>> detailByNum = Collections.emptyMap();
-        if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(outOrderNumbers)) {
+        // if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(outOrderNumbers)) {
+        if (!CollectionUtils.isEmpty(outOrderNumbers)) {
             OutMaterialDetailDO detailQuery = new OutMaterialDetailDO();
             detailQuery.setOutOrderNumberList(outOrderNumbers);
             List<OutMaterialDetailPO> detailTreeList = outMaterialDetailService.queryListChildren(detailQuery);
@@ -276,9 +278,9 @@ public class StockOutOrderApplicationService {
             if (invoiceNoByNum.containsKey(outOrderNumber)) {
                 stockOutOrderPO.setInvoiceNo(invoiceNoByNum.get(outOrderNumber));
             }
-            if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail())) {
-                stockOutOrderPO.setMaterialDetailList(detailByNum.getOrDefault(outOrderNumber, Collections.emptyList()));
-            }
+            // if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail())) {
+            stockOutOrderPO.setMaterialDetailList(detailByNum.getOrDefault(outOrderNumber, Collections.emptyList()));
+            // }
 
             List<DeliveryDetailsLink> list = deliveryDetailsLinkService.list(new LambdaQueryWrapper<DeliveryDetailsLink>().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber));
             stockOutOrderPO.setDeliveryDetailsLinkList(list);