From 5c52b18b62bd37ff96bc40cecbc48a5dccbe725e Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 14 Aug 2025 18:31:06 +0800
Subject: [PATCH] 11

---
 .../SpecialDetails/SpecialDetailsReport.cs             | 10 +++++-----
 非C#代码文件/特价明细表SQL22.sql                       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
index 26f6e16..f403e25 100644
--- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
+++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
@@ -443,7 +443,7 @@ FROM #PLChongDianZhuangHeTong ;");
        END AS 'CurrentSettledUpsetJinE',                                                 --当期结算价*数量（仪表）
 
         CASE         
-           WHEN  ROW_NUMBER() OVER (PARTITION BY A.FID,AAA.TableName ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 1 THEN
+           WHEN  ROW_NUMBER() OVER (PARTITION BY A.FID ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 1 THEN
                CAST(ISNULL(A.F_VRYF_Amount_yrr, 0) AS FLOAT)
            ELSE
                NULL
@@ -502,20 +502,20 @@ FROM #PLChongDianZhuangHeTong ;");
                ''
        END AS 'ProjectPhase',                                                            --项目阶段
        CASE
-           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY a.FID,AAA.TableName,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 A.fid desc ,B.FENTRYID) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 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 A.fid desc ,B.FENTRYID) = 1 THEN
+           WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY a.FID,AAA.TableName,b.FENTRYID) = 1 THEN
               (SELECT SUM([bbb].[到期金额]*BBB.汇率)  FROM dbo.ZRP_YingShouMingXi_yuyubo bbb WHERE a.FID=bbb.销售单主键ID )
            ELSE
                NULL
@@ -767,7 +767,7 @@ FROM #PLChongDianZhuangHeTong ;");
 
 
 		
-UPDATE  #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.含税单价*K3.销售出库数量*1.000,0)
+UPDATE  #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.含税单价*(isnull(K3.销售出库数量,0)+isnull(K3.其他出库数量,0))*1.000,0)
 FROM  dbo.oldk3seorder0701 k3 
 WHERE F_K3SEQ=k3.行号 AND #tempDaBiao.ContractNumber=k3.合同号;
 
diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql
index 0474471..cbb540f 100644
--- a/非C#代码文件/特价明细表SQL22.sql
+++ b/非C#代码文件/特价明细表SQL22.sql
@@ -576,7 +576,7 @@ FROM #PLChongDianZhuangHeTong ;
         ON B.FENTRYID = H7.FSID   AND   1=1   ;
 
 		
-UPDATE  #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.��˰����*K3.���۳�������*1.000,0)
+UPDATE  #tempDaBiao SET NotShipmentsAmount=NotShipmentsAmount-ISNULL(k3.��˰����*(K3.���۳�������+K3.������������)*1.000,0)
 FROM  dbo.oldk3seorder0701 k3 
 WHERE F_K3SEQ=k3.�к� AND #tempDaBiao.ContractNumber=k3.��ͬ��