From b1949ecacec0f2848ae5989db588d8322d67f829 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 14 Aug 2025 15:48:22 +0800
Subject: [PATCH] 1

---
 .../SpecialDetails/SpecialDetailsReport.cs                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
index 4590979..1f8e084 100644
--- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
+++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
@@ -502,20 +502,20 @@ FROM #PLChongDianZhuangHeTong ;");
                ''
        END AS 'ProjectPhase',                                                            --项目阶段
        CASE
-           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
                C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0)
            ELSE
                NULL
        END AS 'OrderAllAmount',                                                          --订单总额
        CASE
-           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY fid desc ,FIDENTITYID) = 1 THEN
                C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0)
            ELSE
                NULL
        END AS 'NotShipmentsAmount',                                                      --未发货金额
       
       CASE
-           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
               (SELECT SUM([bbb].[到期金额]*BBB.汇率)  FROM dbo.ZRP_YingShouMingXi_yuyubo bbb WHERE a.FID=bbb.销售单主键ID )
            ELSE
                NULL