From a9e744751d6b2ed04da5fd5e1ade4c07c0f7a1ad Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 14 Apr 2026 13:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=AB=AF=E4=BC=A0=E4=BA=86cu?=
 =?UTF-8?q?stomerId=E6=97=B6,=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90=E6=A0=87=E7=AD=BE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/ReportLabelListServiceImpl.java      | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 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 c8d5e09..c1a9a50 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
@@ -712,23 +712,25 @@ public class ReportLabelListServiceImpl extends ServiceImpl<ReportLabelListMappe
             queryParams.put("lineNo", printRequest.getLineNo());
             queryParams.put("relNo", printRequest.getRelNo());
             queryParams.put("lineItemNo", printRequest.getLineItemNo());
-            // 添加自定义字段 前端补充字段（视图无字段时用于标签替换）比如标签有一个元素是#{qty}，是视图里不存在的，前端传入{
-            //  "reportId": "xxx",
-            //  "labelType": "xxx",
-            //  "site": "55",
-            //  "userId": "admin",
-            //  "unitIds": ["A5500000001"],
-            //  "consignmentId": "1773845",
-            //  "jobNo": "71330430",
-            //  "lineNo": "19",
-            //  "relNo": "1",
-            //  "lineItemNo": 0,
-            //  "customFields": {
-            //    "QTY": 120,
-            //    "grossWeight": 15.6,
-            //    "netWeight": 14.9
-            //  }
-            //}
+            /* 添加自定义字段 前端补充字段（视图无字段时用于标签替换）比如标签有一个元素是#{qty}，是视图里不存在的，前端传入
+            {
+              "reportId": "xxx",
+              "labelType": "xxx",
+              "site": "55",
+              "userId": "admin",
+              "unitIds": ["A5500000001"],
+              "consignmentId": "1773845",
+              "jobNo": "71330430",
+              "lineNo": "19",
+              "relNo": "1",
+              "lineItemNo": 0,
+              customerId: "CUST123",// customerId是可选的，如果传了，系统会优先根据customerId解析标签编号
+              "customFields": {
+                "QTY": 120,
+                "grossWeight": 15.6,
+                "netWeight": 14.9
+              }
+            }*/
             // 则系统会替换customFields里的qty字段到ZPL代码里对应的位置
             Map<String, Object> customFields = printRequest.getCustomFields();
             if (customFields != null && !customFields.isEmpty()) {