From 53e9f977a1b841b2b3f42d3789163af9e83f46f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 7 Jul 2026 09:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialInventory/MaterialInventoryMapper.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index a7cdd0c89..1b82efafd 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -87,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.production_date, a.expiry_date, a.inventory_date,
         a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO,nvl(a.unit_name,b.unit_name) as unit_name,
         a.bar_code as inv_bar_code,
-        a.in_order_number,a.lot_number
+        a.in_order_number,a.lot_number,
+        sort_order as sort_order
     </sql>
 
     <!-- 按物料(wl)汇总：仓库/库区/库位取创建时间最新的一条明细（与 queryListByWl 中 loc 子查询一致；并列时取 material_inventory_id 更大） -->
@@ -391,7 +392,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        group by a.MATERIAL_INVENTORY_ID order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+        group by a.MATERIAL_INVENTORY_ID order by sort_order, a.update_time desc
     </select>
 
     <select id="queryListByWlKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -404,7 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by sort_order, a.update_time desc
     </select>
 
     <select id="queryListByKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -417,7 +418,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+        GROUP BY a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by sort_order, a.update_time desc
     </select>
 
     <select id="queryListByWl" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -450,7 +451,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY a.MATERIAL_BASE_INFO_ID,
                  loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
                  loc.storage_section_id, loc.storage_code, loc.storage_name,
-                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by sort_order, a.update_time desc
     </select>
 
     <!-- 按货主+物料汇总：A货主物料1、A货主物料2、B货主物料1、B货主物料2 为 4 行；库位取该货主+该物料下创建时间最新的一条明细 -->
@@ -484,7 +485,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY a.SHIPPER_ID, a.MATERIAL_BASE_INFO_ID,
                  loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
                  loc.storage_section_id, loc.storage_code, loc.storage_name,
-                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by sort_order, a.update_time desc
     </select>
 
     <select id="queryListByHz" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -497,7 +498,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.SHIPPER_ID order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc
+        GROUP BY a.SHIPPER_ID order by sort_order, a.update_time desc
     </select>
 
     <resultMap type="com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO" id="MaterialQueryListResult">