11

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);
         }
 

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