From b06c07dc6c6d90320bd7d96fc5f56b344392aa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 6 May 2026 19:09:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(qo):=20=E6=96=B0=E5=A2=9E=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- QmsQcMaterialSearchQO中增加sortField和sortOrder字段
- 根据sortField动态选择排序字段，支持多种物料相关字段排序
- 支持sortOrder指定升序或降序，默认降序排序
- QmsQcMaterialMapper.xml中修改SQL实现根据请求参数动态排序
- 默认排序仍为物料编号倒序，兼容无排序参数情况
---
 .../common/pojo/qo/QmsQcMaterialSearchQO.java | 11 ++++
 .../resources/mapper/QmsQcMaterialMapper.xml  | 62 ++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java
index 17890f57..aa3ce757 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java
@@ -34,4 +34,15 @@ public class QmsQcMaterialSearchQO extends PageQO {
      * 物料名称（模糊匹配）
      */
     private String materialName;
+
+    /**
+     * 排序字段（对应 QmsQcMaterialVO 中的字段名，如 materialNo、createTime 等）
+     * 为空时默认按物料编号倒序
+     */
+    private String sortField;
+
+    /**
+     * 排序类型：asc=升序，desc=降序，默认 desc
+     */
+    private String sortOrder;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml
index 73f33dc9..2e556ce0 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml
@@ -48,7 +48,36 @@
                 AND material_name ilike concat('%', #{request.materialName}, '%')
             </if>
         </where>
-        ORDER BY material_no DESC
+        ORDER BY
+        <choose>
+            <when test="request.sortField != null and request.sortField != ''">
+                <choose>
+                    <when test="request.sortField == 'id'">id</when>
+                    <when test="request.sortField == 'materialNo'">material_no</when>
+                    <when test="request.sortField == 'materialDesc'">material_desc</when>
+                    <when test="request.sortField == 'materialDescIsUpgrade'">material_desc_is_upgrade</when>
+                    <when test="request.sortField == 'materialCategoryCode'">material_category_code</when>
+                    <when test="request.sortField == 'materialCategoryCodePathName'">material_category_code_path_name</when>
+                    <when test="request.sortField == 'drawingNo'">drawing_no</when>
+                    <when test="request.sortField == 'drawingNoVer'">drawing_no_ver</when>
+                    <when test="request.sortField == 'materialName'">material_name</when>
+                    <when test="request.sortField == 'materialTexture'">material_texture</when>
+                    <when test="request.sortField == 'materialSpecifications'">material_specifications</when>
+                    <when test="request.sortField == 'isStandardMaintained'">is_standard_maintained</when>
+                    <when test="request.sortField == 'createdType'">created_type</when>
+                    <when test="request.sortField == 'createByName'">create_by_name</when>
+                    <when test="request.sortField == 'createTime'">create_time</when>
+                    <when test="request.sortField == 'updateByName'">update_by_name</when>
+                    <when test="request.sortField == 'updateTime'">update_time</when>
+                    <otherwise>material_no</otherwise>
+                </choose>
+                <choose>
+                    <when test="request.sortOrder != null and request.sortOrder.equalsIgnoreCase('asc')">ASC</when>
+                    <otherwise>DESC</otherwise>
+                </choose>
+            </when>
+            <otherwise>material_no DESC</otherwise>
+        </choose>
     </select>
 
     <!--
@@ -94,7 +123,36 @@
                 AND material_name ilike concat('%', #{request.materialName}, '%')
             </if>
         </where>
-        ORDER BY material_no DESC
+        ORDER BY
+        <choose>
+            <when test="request.sortField != null and request.sortField != ''">
+                <choose>
+                    <when test="request.sortField == 'id'">id</when>
+                    <when test="request.sortField == 'materialNo'">material_no</when>
+                    <when test="request.sortField == 'materialDesc'">material_desc</when>
+                    <when test="request.sortField == 'materialDescIsUpgrade'">material_desc_is_upgrade</when>
+                    <when test="request.sortField == 'materialCategoryCode'">material_category_code</when>
+                    <when test="request.sortField == 'materialCategoryCodePathName'">material_category_code_path_name</when>
+                    <when test="request.sortField == 'drawingNo'">drawing_no</when>
+                    <when test="request.sortField == 'drawingNoVer'">drawing_no_ver</when>
+                    <when test="request.sortField == 'materialName'">material_name</when>
+                    <when test="request.sortField == 'materialTexture'">material_texture</when>
+                    <when test="request.sortField == 'materialSpecifications'">material_specifications</when>
+                    <when test="request.sortField == 'isStandardMaintained'">is_standard_maintained</when>
+                    <when test="request.sortField == 'createdType'">created_type</when>
+                    <when test="request.sortField == 'createByName'">create_by_name</when>
+                    <when test="request.sortField == 'createTime'">create_time</when>
+                    <when test="request.sortField == 'updateByName'">update_by_name</when>
+                    <when test="request.sortField == 'updateTime'">update_time</when>
+                    <otherwise>material_no</otherwise>
+                </choose>
+                <choose>
+                    <when test="request.sortOrder != null and request.sortOrder.equalsIgnoreCase('asc')">ASC</when>
+                    <otherwise>DESC</otherwise>
+                </choose>
+            </when>
+            <otherwise>material_no DESC</otherwise>
+        </choose>
     </select>
 
 </mapper>