From f0e7e1abe29a9418eb97750362667311e256619e Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 25 Aug 2026 10:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5HU=E5=8F=AF=E4=BB=A5=E4=B8=8D=E4=BC=A0?=
 =?UTF-8?q?site?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/scrap/service/impl/ScrapServiceImpl.java       | 3 +--
 .../resources/mapper/handlingunit/HandlingUnitMapper.xml   | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/scrap/service/impl/ScrapServiceImpl.java b/src/main/java/com/gaotao/modules/scrap/service/impl/ScrapServiceImpl.java
index 07de12e5..e0573fae 100644
--- a/src/main/java/com/gaotao/modules/scrap/service/impl/ScrapServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/scrap/service/impl/ScrapServiceImpl.java
@@ -96,8 +96,7 @@ public class ScrapServiceImpl extends AbstractController implements ScrapService
         try {
             // 1. 先从本地数据库查询HandlingUnit信息
             QueryWrapper<HandlingUnit> wrapper = new QueryWrapper<>();
-            wrapper.eq("site", dto.getSite())
-                   .eq("unit_id", dto.getLabelCode());
+            wrapper.eq("unit_id", dto.getLabelCode());
 
             HandlingUnit handlingUnit = handlingUnitService.getOne(wrapper);
             if (handlingUnit == null) {
diff --git a/src/main/resources/mapper/handlingunit/HandlingUnitMapper.xml b/src/main/resources/mapper/handlingunit/HandlingUnitMapper.xml
index de3e18ce..573afef2 100644
--- a/src/main/resources/mapper/handlingunit/HandlingUnitMapper.xml
+++ b/src/main/resources/mapper/handlingunit/HandlingUnitMapper.xml
@@ -72,7 +72,10 @@
             (SELECT COUNT(1) FROM handling_unit_detail d WITH (NOLOCK) WHERE d.site = h.site AND d.unit_id = h.unit_id) as detail_count
         FROM handling_unit h WITH (NOLOCK)
         LEFT JOIN handling_unit p WITH (NOLOCK) ON h.site = p.site AND h.parent_unit_id = p.unit_id
-        WHERE h.site = #{site} AND h.unit_id = #{unitId}
+        WHERE h.unit_id = #{unitId}
+        <if test="site != null and site != ''">
+            AND site = #{site}
+        </if>
     </select>
 
     <!-- 查询子处理单元 -->
@@ -179,7 +182,7 @@
             modified_date = GETDATE()
         WHERE site = #{site} AND unit_id = #{unitId}
     </update>
-    
+
     <!-- rqrq - 取消WMS预留 -->
     <!-- rqrq - 移除ROWLOCK，由数据库自动管理锁粒度 -->
     <update id="cancelReserve">