From 595465249ec4410fba33daa2f4203d114638291e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Tue, 20 Jan 2026 13:10:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(warehouse):=20=E4=BC=98=E5=8C=96Handli?=
 =?UTF-8?q?ngUnit=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2SQL=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/warehouse/LabelQueryMapper.xml     | 47 +++----------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
index 699c9ee..c744f41 100644
--- a/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
+++ b/src/main/resources/mapper/warehouse/LabelQueryMapper.xml
@@ -62,45 +62,9 @@
         </where>
         ORDER BY h.created_date DESC
     </select>
-    <!-- rqrq - 分页查询HandlingUnit标签信息（带栈板库位信息）分页解析失败强行改成嵌套sql便于解析 -->
+    <!-- rqrq -  -->
     <select id="getHandlingUnitLabelListLocation" resultType="com.gaotao.modules.handlingunit.entity.dto.HandlingUnitDto">
-        SELECT
-            t.unitId,
-            t.site,
-            t.partNo,
-            t.partDesc,
-            t.batchNo,
-            t.locationId,
-            t.warehouseId,
-            t.qty,
-            t.inStockFlag,
-            t.status,
-            t.statusDb,
-            t.createdDate,
-            t.createdBy,
-            t.modifiedDate,
-            t.modifiedBy,
-            t.printCount,
-            t.lastPrintDate,
-            t.printerName,
-            t.qrCode,
-            t.barCode,
-            t.remark,
-            t.warehouseName,
-            t.locationName,
-            t.pallet_id,
-            t.station_id,
-            t.station_area,
-            t.height,
-            t.position,
-            t.layer,
-            t.calling_flag,
-            t.lastCountDate,
-            t.engChgLevel,
-            t.expiredDate,
-            t.receiveDate,
-            t.wdr
-        FROM (
+
             SELECT
                 h.unit_id AS unitId,
                 h.site,
@@ -143,7 +107,8 @@
             LEFT JOIN pallet_detail b ON h.unit_id = b.serial_no AND h.site = b.site
             LEFT JOIN pallet p ON b.pallet_id = p.pallet_id AND b.site = p.site
             LEFT JOIN agv_station s ON p.location_code = s.station_code
-            WHERE p.pallet_id IS NOT NULL
+        <where>
+            and p.pallet_id IS NOT NULL
             <if test="params.site != null and params.site != ''">
                 AND h.site = #{params.site}
             </if>
@@ -171,8 +136,8 @@
             <if test="params.stationId != null and params.stationId != ''">
                 AND s.station_id LIKE '%' + #{params.stationId} + '%'
             </if>
-        ) t
-        ORDER BY t.createdDate DESC
+        </where>
+        ORDER BY h.created_date DESC
     </select>
     <select id="getHandlingUnitLabelAll" resultType="com.gaotao.modules.handlingunit.entity.dto.HandlingUnitDto">
         SELECT