diff --git a/Pilot.Report.Exploitation/ContractDetails/ContractDetailsReport.cs b/Pilot.Report.Exploitation/ContractDetails/ContractDetailsReport.cs
index fcfc21a..569cc63 100644
--- a/Pilot.Report.Exploitation/ContractDetails/ContractDetailsReport.cs
+++ b/Pilot.Report.Exploitation/ContractDetails/ContractDetailsReport.cs
@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Kingdee.BOS.Orm.DataEntity;
 using Pilot.Report.Exploitation.PublicClass;
+using Kingdee.BOS.Log;
 
 namespace Pilot.Report.Exploitation.ContractDetails
 {
@@ -315,7 +316,7 @@ namespace Pilot.Report.Exploitation.ContractDetails
             *
             into {0}
             From #TempTable1", tableName);
-
+            Logger.Error("派诺合同明细报表", sql,new Exception());
             DBUtils.Execute(this.Context, sql);
         }
 
diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
index 2ff24d8..6e9e4f1 100644
--- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
+++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
@@ -171,6 +171,7 @@ namespace Pilot.Report.Exploitation.SpecialDetails
         SELECT A.FID AS FID
 INTO #PaiChuGongSi
 FROM T_SAL_ORDER A
+   INNER JOIN T_BD_CUSTOMER CC ON CC.FCUSTID= A.FCUSTID  
     INNER JOIN T_BD_CUSTOMER_L C
         ON C.FCUSTID = A.FCUSTID
            AND C.FLOCALEID = 2052
@@ -191,7 +192,7 @@ WHERE A.FSALEORGID = 100302
       AND ACO.区域 = '碳索智控'
       OR ACL.区域 = '碳索智控'
       OR C.FNAME IN ( '珠海派诺科技股份有限公司', '派诺科技（香港）有限公司', '武汉派诺科技发展有限公司', '珠海华夏云联技术有限公司', '广东碳索智控科技有限公司', '武汉派诺科技发展有限公司', '珠海兴诺能源技术有限公司','广东诺瓦数能科技有限公司' )
-  OR L.FNAME = '兴诺总'  
+  OR L.FNAME = '兴诺总'    OR CC.F_correlation = '1'
             ");
         
             //仪表类
@@ -221,7 +222,7 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
       ON A.F_ORDERCATEGORY = D.FMASTERID    
 WHERE
       (D.FNUMBER IN ( 'P', 'E', 'C', 'S','B' ))
-      AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP)
+      AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP  OR  (B2.FTaxPrice*fin.FExchangeRate < B.F_SHOUGONGJIESUANJIA AND B.F_SettlementP=0 ) )
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'     
       AND B.FQTY >= 0
@@ -291,7 +292,8 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
     JOIN T_SAL_ORDER A --销售订单表
         ON A.FID = B.FID
     LEFT JOIN T_SAL_ORDERENTRY_F B2 --销售订单明细_F表
-        ON B.FENTRYID = B2.FENTRYID   
+        ON B.FENTRYID = B2.FENTRYID 
+  LEFT JOIN T_SAL_ORDERFIN fin ON a.fid=fin.fid
     LEFT JOIN
     (
         SELECT FNUMBER,
@@ -317,7 +319,7 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
         ON G.FMATERIALID = B.FMATERIALID
 WHERE
 (D.FNUMBER IN ('CS','CW' ))
-      AND ( B.F_SPECIALOFFER = '1'  or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY) )     
+      AND ( B.F_SPECIALOFFER = '1'  or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY) OR  (B2.FTaxPrice*fin.FExchangeRate < B.F_SHOUGONGJIESUANJIA AND B.F_SettlementP=0 ) )     
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND B.FQTY >= 0
diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql
index 2788b3c..912ac49 100644
--- a/非C#代码文件/特价明细表SQL22.sql
+++ b/非C#代码文件/特价明细表SQL22.sql
@@ -2,6 +2,7 @@
         SELECT A.FID AS FID
 INTO #PaiChuGongSi
 FROM T_SAL_ORDER A
+   INNER JOIN T_BD_CUSTOMER CC ON CC.FCUSTID= A.FCUSTID         
     INNER JOIN T_BD_CUSTOMER_L C
         ON C.FCUSTID = A.FCUSTID
            AND C.FLOCALEID = 2052
@@ -22,7 +23,7 @@ WHERE A.FSALEORGID = 100302
       AND ACO.���� = '̼���ǿ�'
       OR ACL.���� = '̼���ǿ�'
       OR C.FNAME IN ( '�麣��ŵ�Ƽ��ɷ����޹�˾', '��ŵ�Ƽ�����ۣ����޹�˾', '�人��ŵ�Ƽ���չ���޹�˾', '�麣���������������޹�˾', '�㶫̼���ǿؿƼ����޹�˾', '�人��ŵ�Ƽ���չ���޹�˾', '�麣��ŵ��Դ�������޹�˾','�㶫ŵ�����ܿƼ����޹�˾' )
-  OR L.FNAME = '��ŵ��'  
+  OR L.FNAME = '��ŵ��'  OR CC.F_correlation = '1' 
             /*dialect*/                        
             SELECT A.FBILLNO AS 'AFBILLNO',
        'YB' F_ORDERTYPE,
@@ -36,7 +37,7 @@ FROM T_SAL_ORDERENTRY B --
         ON A.FID = B.FID
     LEFT JOIN T_SAL_ORDERENTRY_F B2 --���۶�����ϸ_F��
         ON B.FENTRYID = B2.FENTRYID  
-    left join T_SAL_ORDERFIN fin on a.fid=fin.fid
+    LEFT JOIN T_SAL_ORDERFIN fin ON a.fid=fin.fid
     LEFT JOIN
     (
         SELECT FNUMBER,
@@ -49,7 +50,7 @@ FROM T_SAL_ORDERENTRY B --
       ON A.F_ORDERCATEGORY = D.FMASTERID    
 WHERE
       (D.FNUMBER IN ( 'P', 'E', 'C', 'S','B' ))
-      AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP)
+      AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP  OR  (B2.FTaxPrice*fin.FExchangeRate < B.F_SHOUGONGJIESUANJIA AND B.F_SettlementP=0 ) )
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'     
       AND B.FQTY >= 0
@@ -60,7 +61,7 @@ WHERE
       AND A.FID NOT IN
           (
               SELECT FID FROM #PaiChuGongSi
-          )   AND   1=1  AND a.F_CONTRACTNUMBER like '%BS202508040024%' ; /*dialect*/
+          )   AND   1=1  AND a.F_CONTRACTNUMBER LIKE '%P202312120001%' ; /*dialect*/
             SELECT  A.FBILLNO AS 'AFBILLNO',
        'XT' F_ORDERTYPE,
        CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --����
@@ -100,7 +101,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW','B' )
       AND A.FID NOT IN
           (
               SELECT FID FROM #PaiChuGongSi
-          )  AND   1=1  AND a.F_CONTRACTNUMBER like '%BS202508040024%';    /*dialect*/
+          )  AND   1=1  AND a.F_CONTRACTNUMBER like '%P202312120001%';    /*dialect*/
     SELECT   A.FBILLNO AS 'AFBILLNO',
        'CDZ' F_ORDERTYPE,
        CONVERT(NVARCHAR, A.FApproveDate, 23) AS 'Date',                                         --����
@@ -113,6 +114,7 @@ FROM T_SAL_ORDERENTRY B --
         ON A.FID = B.FID
     LEFT JOIN T_SAL_ORDERENTRY_F B2 --���۶�����ϸ_F��
         ON B.FENTRYID = B2.FENTRYID   
+    LEFT JOIN T_SAL_ORDERFIN fin ON a.fid=fin.fid
     LEFT JOIN
     (
         SELECT FNUMBER,
@@ -138,7 +140,7 @@ FROM T_SAL_ORDERENTRY B --
         ON G.FMATERIALID = B.FMATERIALID
 WHERE
 (D.FNUMBER IN ('CS','CW' ))
-      AND ( B.F_SPECIALOFFER = '1'  or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY) )     
+      AND ( B.F_SPECIALOFFER = '1'  or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY)  OR  (B2.FTaxPrice*fin.FExchangeRate < B.F_SHOUGONGJIESUANJIA AND B.F_SettlementP=0 ) )     
       AND B.F_YKQC_CHECKBOX_QTR != '1'
       AND A.FDOCUMENTSTATUS = 'C'
       AND B.FQTY >= 0
@@ -150,7 +152,7 @@ WHERE
           (
               SELECT FID FROM #PaiChuGongSi
           )
-	  AND G.FNUMBER LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%BS202508040024%' ; 
+	  AND G.FNUMBER LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%P202312120001%' ; 
 	  
 	  
 	  /*dialect*/
@@ -207,7 +209,7 @@ WHERE
           (
               SELECT FID FROM #PaiChuGongSi
           )
-	 AND G.FNUMBER not LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%BS202508040024%'; /*dialect*/
+	 AND G.FNUMBER not LIKE 'V%'  AND   1=1  AND a.F_CONTRACTNUMBER like '%P202312120001%'; /*dialect*/
           /*dialect*/
 SELECT *
 INTO #TempTable3
@@ -568,7 +570,7 @@ FROM #PLChongDianZhuangHeTong ;/*dialect*/
                 ON W1.FENTRYID = W2.FENTRYID
         WHERE W2.FSTABLENAME = 'T_SAL_ORDERENTRY'
     ) H7
-        ON B.FENTRYID = H7.FSID   AND   1=1  AND a.F_CONTRACTNUMBER like '%BS202508040024%'  ;
+        ON B.FENTRYID = H7.FSID   AND   1=1  AND a.F_CONTRACTNUMBER like '%P202312120001%'  ;