From d430ff14230b340a769b9bfcd9b4d8a25296af52 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Wed, 2 Jul 2025 18:25:40 +0800
Subject: [PATCH] 11

---
 .../SpecialDetails/SpecialDetailsReport.cs        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
index 630d272..40a6390 100644
--- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
+++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
@@ -216,10 +216,11 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
       ON A.F_ORDERCATEGORY = D.FMASTERID    
 WHERE
       (D.FNUMBER IN ( 'P', 'E', 'C', 'S' ))
-      AND B.F_SPECIALOFFER = '1'
+      AND (B.F_SPECIALOFFER = '1' OR B2.FALLAMOUNT < B.F_SettlementAmount)
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
+      AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'    
       AND A.FMANUALCLOSE <> '1'
@@ -259,10 +260,11 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
    
 --ES、W、SX、CW、D、CY
 WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' )
-   AND (A.F_SpecialContracts = '是'  OR a.F_GROSSMARGIN1='<35%')
+    AND (A.F_SpecialContracts = '是'  OR a.F_GROSSMARGIN1='<35%'  OR a.F_VRYF_Amount_yrr > c.FBillAllAmount )
       AND B.FQTY >= 0
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
+  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
       AND A.FMANUALCLOSE = '0'    
       AND A.F_CONTRACTNUMBER NOT LIKE 'Z%'
       AND A.FMANUALCLOSE <> '1'
@@ -316,6 +318,7 @@ WHERE
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
+  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'     
       AND A.FMANUALCLOSE <> '1'
@@ -374,6 +377,7 @@ WHERE
 	 AND (A.F_SpecialContracts = '是'  OR a.F_GROSSMARGIN1='<35%')
       AND A.FDOCUMENTSTATUS = 'C'
       AND A.FBUSINESSTYPE = 'NORMAL'
+  	  AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A'
       AND B.FQTY >= 0
       AND A.FMANUALCLOSE = '0'     
       AND A.FMANUALCLOSE <> '1'
@@ -433,8 +437,11 @@ FROM #PLChongDianZhuangHeTong ;");
        END AS 'CurrentSettledUpset1',                                                    --当期结算价（仪表）
       
         CASE
-           WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN
-              isnull(g.F_JSJ,0)* B.FQTY+isnull(A.F_KFYS,0)+isnull(F_SGCB,0)+isnull(F_SSRT,0)*800+isnull(F_SJRT,0)*800 
+            WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN		   
+              isnull(g.F_JSJ,0)* B.FQTY   +isnull(( CASE  WHEN F_SSRT = ' ' THEN 0 ELSE CONVERT(DECIMAL(18,10), F_SSRT) END),0)*800 
+			  +  isnull(( CASE  WHEN F_SJRT = ' ' THEN 0 ELSE CONVERT(DECIMAL(18,10), F_SJRT) END),0) *800 
+			  +   isnull(( CASE  WHEN F_KFYS = ' ' THEN 0 ELSE CONVERT(DECIMAL(18,10), F_SJRT) END),0)
+			  +  isnull(( CASE  WHEN F_SGCB = ' ' THEN 0 ELSE CONVERT(DECIMAL(18,10), F_SJRT) END),0)
            WHEN AAA.F_ORDERTYPE = 'XT'
              AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
                CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT)