From d9c3f946a233c39157cca288dda35a03995ba635 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 30 Oct 2026 10:38:06 +0800
Subject: [PATCH] site

---
 .../warehouse/controller/LabelQueryController.java  | 13 +++++++------
 src/main/resources/mapper/base/BaseMapper.xml       |  3 ---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/warehouse/controller/LabelQueryController.java b/src/main/java/com/gaotao/modules/warehouse/controller/LabelQueryController.java
index f0f2523c..d9cd0c65 100644
--- a/src/main/java/com/gaotao/modules/warehouse/controller/LabelQueryController.java
+++ b/src/main/java/com/gaotao/modules/warehouse/controller/LabelQueryController.java
@@ -72,14 +72,15 @@ public class LabelQueryController extends AbstractController {
             // 执行打印
             reportLabelListService.printLabel(printRequest);
 
-            // 打印成功后更新HandlingUnit信息
-            if (printRequest.getUnitId() != null && !printRequest.getUnitId().isEmpty()) {
+            // 打印次数必须写回标签所属工厂。site 是登录工厂，跨工厂重打时用它匹配不到 handling_unit。
+            if (printRequest.getUnitId() != null && !printRequest.getUnitId().isEmpty()
+                    && printRequest.getSubSite() != null && !printRequest.getSubSite().isBlank()) {
                 String printerName = printRequest.getUsername() != null ? printRequest.getUsername() : "";
                 handlingUnitMapper.updateHandlingUnitPrintInfo(
-                    printRequest.getSite(),
-                    printRequest.getUnitId(),
-                    printerName,
-                    printRequest.getUserId()
+                        printRequest.getSubSite(),
+                        printRequest.getUnitId(),
+                        printerName,
+                        printRequest.getUserId()
                 );
             }
 
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index d595470e..03cabaf8 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -549,9 +549,6 @@
         <where>
             <if test="params != null">
                 <!-- 动态生成查询条件 -->
-                <if test="params.site != null and params.site != ''">
-                    AND site = #{params.site}
-                </if>
                 <if test="params.receiptNo != null and params.receiptNo != ''">
                     AND receipt_no = #{params.receiptNo}
                 </if>