From b32af48e975b767159a0074849e7b0ea2e33ffd6 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Fri, 9 Jan 2026 14:00:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(srm):=20=E9=87=8D=E6=9E=84=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E5=92=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将供应商组描述字段重命名为组文档类型并更新相关getter/setter方法
- 调整SQL映射文件中的LEFT JOIN语句格式保持一致性
- 修改供应商查询的排序字段从创建日期改为ID
---
 .../com/xujie/modules/srm/data/SrmSupplierData.java    | 10 +++++-----
 src/main/resources/mapper/srm/SrmSupplierMapper.xml    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java b/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java
index f14098d..f1055ce 100644
--- a/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java
+++ b/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java
@@ -16,12 +16,12 @@ public class SrmSupplierData extends SrmSupplier {
         this.groupDesc = groupDesc;
     }
 
-    public String getSupplierGroupDesc() {
-        return this.groupDesc;
+    private String groupDocType;
+    public String getGroupDocType() {
+        return this.groupDocType;
     }
-    public void setSupplierGroupDesc(String groupDesc) {
-        this.groupDesc = groupDesc;
+    public void setGroupDocType(String groupDocType) {
+        this.groupDocType = groupDocType;
     }
 
-
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
index 6923ea9..7aa5474 100644
--- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml
+++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
@@ -22,12 +22,12 @@
         s.Other_contact1,s.Other_contact2,s.Other_contact3,
         s.Memo
         FROM srm_supplier s LEFT JOIN SupplierGroup sg ON sg.supplier_group = s.supplier_group
-        AND sg.Site = s.site LEFT JOIN Currency c ON c.Currency = s.Currency
+        AND sg.Site = s.site  LEFT JOIN Currency c ON c.Currency = s.Currency
         AND c.Site = s.site LEFT JOIN Tax t ON t.TaxCode = s.TaxCode
         AND t.Site = s.site
         LEFT JOIN DeliveryTerm dt
         ON dt.DeliveryTermID = s.DeliveryTerm
-        AND dt.Site   = s.site
+        AND dt.Site  = s.site
         LEFT JOIN PaymentTerm pt
         ON pt.PaymentTermID = s.PaymentTerm
         AND pt.Site  = s.site
@@ -52,7 +52,7 @@
                 AND s.Active = #{query.active}
             </if>
         </where>
-        ORDER BY s.create_date DESC
+        ORDER BY id
     </select>
     <select id="checkSrmSupplierList" resultType="SrmSupplierData">
         SELECT