From 19928177f6f4b72715eecb3749deb8004d24850d Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 26 Aug 2026 17:11:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(port):=20=E6=B7=BB=E5=8A=A0=E6=B8=AF?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=9B=BD=E5=AE=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在PortInfo实体类中新增country属性
- 在PortInfoMapper.xml中添加country字段映射
- 更新基础查询列包含country字段
- 添加根据国家查询港口的功能
- 在更新港口信息时支持设置国家字段

feat(srm): 添加供应商状态字段

- 在SrmSupplier实体类中新增status属性用于表示活跃状态
- 在SrmSupplierMapper.xml中添加status字段映射
- 更新供应商查询功能支持按状态筛选
- 在新增和更新供应商时支持状态字段操作
---
 .../java/com/xujie/modules/port/entity/PortInfo.java |  2 ++
 .../com/xujie/modules/srm/entity/SrmSupplier.java    |  3 ++-
 src/main/resources/mapper/port/PortInfoMapper.xml    |  5 ++++-
 src/main/resources/mapper/srm/SrmSupplierMapper.xml  | 12 ++++++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/modules/port/entity/PortInfo.java b/src/main/java/com/xujie/modules/port/entity/PortInfo.java
index 74026c8..0289799 100644
--- a/src/main/java/com/xujie/modules/port/entity/PortInfo.java
+++ b/src/main/java/com/xujie/modules/port/entity/PortInfo.java
@@ -59,6 +59,8 @@ public class PortInfo extends QueryPage {
     @ApiModelProperty(value = "是否目的港(Y/N)")
     private String isDestinationPort;
 
+    @ApiModelProperty(value = "国家")
+    private String country;
     public Object getKey() {
         return this.id;
     }
diff --git a/src/main/java/com/xujie/modules/srm/entity/SrmSupplier.java b/src/main/java/com/xujie/modules/srm/entity/SrmSupplier.java
index 9e4cda5..b86a5df 100644
--- a/src/main/java/com/xujie/modules/srm/entity/SrmSupplier.java
+++ b/src/main/java/com/xujie/modules/srm/entity/SrmSupplier.java
@@ -138,6 +138,7 @@ public class SrmSupplier extends QueryPage {
     @ApiModelProperty(value = "供应商简称（NPC）")
     private String cShortNpc;
 
-
+    // 活跃状态
+    private String status;
 
 }
diff --git a/src/main/resources/mapper/port/PortInfoMapper.xml b/src/main/resources/mapper/port/PortInfoMapper.xml
index f750e6b..9453348 100644
--- a/src/main/resources/mapper/port/PortInfoMapper.xml
+++ b/src/main/resources/mapper/port/PortInfoMapper.xml
@@ -15,12 +15,13 @@
         <result column="active" property="active" />
         <result column="is_departure_port" property="isDeparturePort" />
         <result column="is_destination_port" property="isDestinationPort" />
+        <result column="country" property="country" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="BaseColumnList">
         port_code, port_name, remark, create_by, create_date, update_by, update_date, id, active,
-        is_departure_port, is_destination_port
+        is_departure_port, is_destination_port, country
     </sql>
 
     <select id="getListByModel" resultType="com.xujie.modules.port.entity.PortInfo">
@@ -49,6 +50,7 @@
         <where>
         <if test="query.portCode != null and query.portCode != '' "> and port_code like '%${query.portCode}%'</if>
         <if test="query.portName != null and query.portName != '' "> and port_name like '%${query.portName}%'</if>
+        <if test="query.country != null and query.country != '' "> and country like '%${query.country}%'</if>
         <if test="query.remark != null and query.remark != '' "> and remark like '%${query.remark}%'</if>
         <if test="query.createBy != null and query.createBy != '' "> and create_by like '%${query.createBy}%'</if>
         <if test="query.createDate != null and query.createDate != '' "> and create_date like '%${query.createDate}%'</if>
@@ -77,6 +79,7 @@
         UPDATE port_info
         SET
             port_name = #{portName},
+            country = #{country},
             remark = #{remark},
             active = #{active},
             is_departure_port = #{isDeparturePort},
diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
index a69fab6..59c7897 100644
--- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml
+++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
@@ -7,7 +7,7 @@
         id,site,supplier_no,supplier_name,supplier_group,create_date,create_by,update_date,update_by,supplier_doc_type,
         TaxCode,FaxNo,PhoneNo,Contact,Address,PaymentTerm,DeliveryTerm,Buyer,Currency,ABC,Active,CreateDate,BankName,BankAccount,
         TaxNo,Email,Memo,CustomerAddress,Tax,Email2,PhoneNo2,PhoneNo3,SourcingStaff,Other_contact1,Other_contact2,Other_contact3,
-        c_short_office,c_short_npc,planner
+        c_short_office,c_short_npc,planner,status
     </sql>
 
 
@@ -18,6 +18,7 @@
         s.supplier_no AS supplierNo,
         s.supplier_name AS supplierName,
         s.supplier_group AS supplierGroup,
+        s.status AS status,
         sg.dict_label AS groupDesc,
         s.supplier_doc_type AS supplierDocType,
         s.create_date AS createDate,
@@ -97,6 +98,11 @@
             <if test="query.active != null and query.active != ''">
                 AND s.Active = #{query.active}
             </if>
+
+            <if test="query.status != null and query.status != ''">
+                AND s.status = #{query.status}
+            </if>
+
             <if test="query.planner != null and query.planner != ''">
                 AND (
                     ISNULL(s.planner, '') LIKE '%' + #{query.planner} + '%'
@@ -355,6 +361,7 @@
             site,
             supplier_no,
             supplier_name,
+            status,
             supplier_group,
             create_date,
             create_by,
@@ -389,6 +396,7 @@
             #{site},
             #{supplierNo},
             #{supplierName},
+            #{status},
             #{supplierGroup},
             #{createDate},
             #{createBy},
@@ -424,7 +432,7 @@
 
     <!-- 更新供应商 -->
     <update id="updateSrmSupplier" parameterType="com.xujie.modules.srm.entity.SrmSupplier">
-        UPDATE srm_supplier set  supplier_name = #{supplierName},  supplier_group = #{supplierGroup},   active = #{active}, supplier_doc_type = #{supplierDocType},
+        UPDATE srm_supplier set  supplier_name = #{supplierName},  supplier_group = #{supplierGroup},   active = #{active}, status = #{status}, supplier_doc_type = #{supplierDocType},
         taxCode = #{taxCode},     abc = #{abc}, sourcingStaff = #{sourcingStaff},     currency = #{currency},   paymentTerm = #{paymentTerm},    deliveryTerm = #{deliveryTerm},
         phoneNo = #{phoneNo},phoneNo2 = #{phoneNo2},phoneNo3 = #{phoneNo3},email = #{email}, email2 = #{email2},faxNo = #{faxNo},Other_contact1 = #{otherContact1},Other_contact2 = #{otherContact2},
         Other_contact3 = #{otherContact3},bankName= #{bankName},bankAccount = #{bankAccount}, address = #{address},memo = #{memo},c_short_office=#{cShortOffice},c_short_npc=#{cShortNpc},planner=#{planner}