From 117b27316c86bca9ab759bcd7233470ba4b9567a Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 5 Dec 2025 17:17:26 +0800
Subject: [PATCH] FSC

---
 .../modules/ecss/entity/EcssCoDelNotifyHeader.java    |  4 +++-
 src/main/resources/mapper/ecss/CoDelMapper.xml        | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java
index e0580eb7..2d4ff345 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java
@@ -87,10 +87,12 @@ public class EcssCoDelNotifyHeader extends QueryPage {
     private Date updateDate;
     private String updateBy;
     private String declarationNo;
-    
+
     /**
      * 改单次数 - 记录发货通知单被修改的次数
      */
     private Integer modifyCount;
+
+    private String fscFlag;
 }
 
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 363853a2..517e45e6 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -4,12 +4,10 @@
    <select id="searchEcssCoDelNotifyHeader"   resultType="EcssCoDelNotifyHeaderData">
         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,
-        a.modifyFlag,a.modify_count as modifyCount,a.overseasShipper,a.overseasAddress,a.cnative,a.localShipAddress,a.walMartOrderFlag
+        a.modifyFlag,a.modify_count as modifyCount,a.overseasShipper,a.overseasAddress,a.cnative,a.localShipAddress,a.walMartOrderFlag,a.fscFlag
        from ecss_CoDelNotifyHeader a
            left join accessBu D on A.site=D.site and A.bu_no=d.bu_no and D.username=#{query.username}
-
      <where>
-
             and D.site is not null
             <if test="query.buNo != null and query.buNo != ''">
                 AND a.bu_no = #{query.buNo}
@@ -22,6 +20,9 @@
             </if>
                <if test="query.notifyStatus != null and query.notifyStatus != ''">
                 AND a.notify_status = #{query.notifyStatus}
+            </if>
+             <if test="query.fscFlag == 'true'">
+                AND a.fscFlag = 'Y'
             </if>
             <if test = "query.startDate!= null">
                AND a.ready_date>= #{query.startDate}
@@ -39,7 +40,7 @@
    <select id="searchEcssCoDelNotifyHeaderForCK"   resultType="EcssCoDelNotifyHeaderData">
         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,a.walMartOrderFlag,
-       a.modifyFlag,a.modify_count as modifyCount,ISNULL(a.export_flag,'N') as exportFlag
+       a.modifyFlag,a.modify_count as modifyCount,ISNULL(a.export_flag,'N') as exportFlag,a.fscFlag
        from ecss_CoDelNotifyHeader a
            left join accessBu D on A.site=D.site and A.bu_no=d.bu_no and D.username=#{query.username}
 
@@ -235,7 +236,7 @@
     </update>
 
     <update id="changeEcssDelStatus">
-        update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag} where site=#{site} and delNo=#{delNo}
+        update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag},fscFlag=#{fscFlag} where site=#{site} and delNo=#{delNo}
     </update>
 
     <update id="updateEcssDelDetailStatus">