From 2f0c9db111e440a02bf6fb4aeac88af20f88e531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 13 Mar 2026 21:12:28 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialInventoryMapper.xml               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 75114e70a..09c6743dd 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -326,24 +326,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="materialQueryListByGroup">
         <choose>
             <when test="queryType != null and queryType == 1">
-                group by a.shipper_id, a.shipper_code, a.shipper_name
-                order by a.shipper_name
+                group by a.shipper_id
+                order by max(a.shipper_name)
             </when>
             <when test="queryType != null and queryType == 2">
-                group by b.material_base_info_id, a.shipper_id, b.material_code, b.material_name, a.shipper_code, a.shipper_name
-                order by b.material_name, a.shipper_name
+                group by b.material_base_info_id, a.shipper_id
+                order by max(b.material_name), max(a.shipper_name)
             </when>
             <when test="queryType != null and queryType == 3">
-                group by b.material_base_info_id, a.shipper_id, a.batch_number, b.material_code, b.material_name, a.shipper_code, a.shipper_name
-                order by b.material_name, a.shipper_name, a.batch_number
+                group by b.material_base_info_id, a.shipper_id, a.batch_number
+                order by max(b.material_name), max(a.shipper_name), a.batch_number
             </when>
             <when test="queryType != null and queryType == 4">
-                group by a.storage_location_id, a.storage_location_code, a.storage_location_name, a.storage_section_id, a.storage_code, a.storage_name
-                order by a.storage_location_code
+                group by a.storage_location_id
+                order by max(a.storage_location_code)
             </when>
             <when test="queryType != null and queryType == 5">
-                group by b.material_base_info_id, a.storage_location_id, a.shipper_id, b.material_code, b.material_name, a.storage_location_code, a.storage_location_name, a.shipper_code, a.shipper_name
-                order by b.material_name, a.storage_location_code, a.shipper_name
+                group by b.material_base_info_id, a.storage_location_id, a.shipper_id
+                order by max(b.material_name), max(a.storage_location_code), max(a.shipper_name)
             </when>
             <when test="queryType != null and queryType == 6">
                 group by a.container_id, a.container_code, a.container_type, a.container_type_name