From cb7986dabb7f682d83e48face259ca8c995a2c34 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 21 Oct 2026 14:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E6=A0=87=E7=AD=BE=E4=B8=94=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E5=B0=B1=E6=98=AF=E5=BD=93=E5=89=8D=E5=A4=96=E7=AE=B1?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8D=E6=98=AF=E8=BF=99=E5=BC=A0=E5=A4=96=E7=AE=B1?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E7=AE=B1,=E6=B2=A1=E6=9C=89=E8=BF=99?=
 =?UTF-8?q?=E6=A0=B7=E7=9A=84=E8=A1=8C=E5=B0=B1=E8=BF=94=E5=9B=9E=20null?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E7=94=A8=E6=96=B9=E5=8F=AA=E6=89=93=E5=A4=96?=
 =?UTF-8?q?=E7=AE=B1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/ReportLabelListServiceImpl.java      | 52 +++----------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java
index b6074cb2..a4547d02 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java
@@ -1033,29 +1033,24 @@ public class ReportLabelListServiceImpl extends ServiceImpl<ReportLabelListMappe
     }
 
     /**
-     * 根据外箱标签解析对应内箱标签
+     * 查外箱下面有没有内箱。ParentReportID 等于外箱编号即表示挂了内箱，返回该行的 ReportID。
+     * 例如 ParentReportID=A068 时，A068 的内箱是 A067。不看标签类型，也不按地址回退。
+     * 没有这样的行就返回 null，调用方只打外箱。
      */
     private String resolveInnerLabelByCustomer(PrintLabelRequest printRequest, String outerLabelNo) {
         String customerId = StringUtils.trimToNull(printRequest.getCustomerId());
         if (StringUtils.isBlank(customerId) || StringUtils.isBlank(outerLabelNo)) {
             return null;
         }
-        String addressNo = StringUtils.trimToNull(printRequest.getAddressNo());
         try {
             CustomerLabelSettingData query = new CustomerLabelSettingData();
             query.setSearchFlag("Y");
             query.setCustomerId(customerId.trim());
-            // 不在SQL层限定addressNo，保留“地址精确匹配 -> 客户通用地址回退”的业务顺序
             List<CustomerLabelSettingData> customerLabelList = baseService.getCustomerLabelSettingList(query);
             if (customerLabelList == null || customerLabelList.isEmpty()) {
                 return null;
             }
 
-            CustomerLabelSettingData exactInnerLabel = null;
-            CustomerLabelSettingData exactAnyLabel = null;
-            CustomerLabelSettingData fallbackInnerLabel = null;
-            CustomerLabelSettingData fallbackAnyLabel = null;
-
             for (CustomerLabelSettingData item : customerLabelList) {
                 if (item == null || StringUtils.isBlank(item.getLabelNo())) {
                     continue;
@@ -1064,51 +1059,16 @@ public class ReportLabelListServiceImpl extends ServiceImpl<ReportLabelListMappe
                         && !StringUtils.equalsIgnoreCase(printRequest.getSite(), item.getSite())) {
                     continue;
                 }
+                // 子标签且上级就是当前外箱，才是这张外箱的内箱
                 if (!"Y".equalsIgnoreCase(StringUtils.trimToEmpty(item.getSubLabelFlag()))) {
                     continue;
                 }
                 if (!StringUtils.equalsIgnoreCase(StringUtils.trimToEmpty(item.getParentLabelNo()), outerLabelNo)) {
                     continue;
                 }
-
-                boolean isInnerLabelType = "内箱标签".equals(StringUtils.trimToEmpty(item.getLabelType()));
-                String itemAddressNo = StringUtils.trimToNull(item.getAddressNo());
-
-                if (StringUtils.isNotBlank(addressNo)) {
-                    if (StringUtils.equalsIgnoreCase(addressNo, itemAddressNo)) {
-                        if (isInnerLabelType) {
-                            exactInnerLabel = item;
-                            break;
-                        }
-                        if (exactAnyLabel == null) {
-                            exactAnyLabel = item;
-                        }
-                        continue;
-                    }
-                    if (StringUtils.isBlank(itemAddressNo)) {
-                        if (isInnerLabelType && fallbackInnerLabel == null) {
-                            fallbackInnerLabel = item;
-                        }
-                        if (fallbackAnyLabel == null) {
-                            fallbackAnyLabel = item;
-                        }
-                    }
-                    continue;
-                }
-
-                if (isInnerLabelType) {
-                    exactInnerLabel = item;
-                    break;
-                }
-                if (exactAnyLabel == null) {
-                    exactAnyLabel = item;
-                }
+                return item.getLabelNo();
             }
-
-            CustomerLabelSettingData targetLabel = exactInnerLabel != null ? exactInnerLabel
-                    : (exactAnyLabel != null ? exactAnyLabel
-                    : (fallbackInnerLabel != null ? fallbackInnerLabel : fallbackAnyLabel));
-            return targetLabel != null ? targetLabel.getLabelNo() : null;
+            return null;
         } catch (Exception e) {
             log.warn("根据外箱标签解析内箱标签失败，customerId={}, outerLabelNo={}, error={}",
                     customerId, outerLabelNo, e.getMessage());