Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom into main

派诺报表SQL文件/销售执行统计表存储过程.sql

@@ -133,7 +133,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  --过滤派诺总                        
  SELECT A.FID AS FID                   
  INTO #TEMP3                  
- FROM T_SAL_ORDER A                                                     
+ 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                                                    
  LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID                         
  left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'                          
@@ -142,10 +143,12 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.名称=O.FNAME                                                                     
  LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.名称=L.FNAME                                                     
  WHERE A.FSALEORGID = 100302 AND                                                    
- (ACO.区域 = '碳索智控'                                                     
- OR ACL.区域 = '碳索智控'                                                        
- OR C.FCUSTID IN ('1517849','1156999','1149200')                  
- OR (C.FCUSTID = 1150173 AND (ACO.区域 = '决策团队' OR ACL.区域 = '决策团队'))                  
+ (
+   CC.F_correlation <> '1'
+  -- OR
+  --C.FCUSTID IN ('1517849','1156999','1149200')                  
+  OR 
+ (C.FCUSTID = 1150173 AND (ACO.区域 = '决策团队' OR ACL.区域 = '决策团队'))                  
  OR L.FNAME = '兴诺总'                  
  OR A.FID IN (110185,207800)                       
  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                      
@@ -274,7 +277,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.名称=O.FNAME AND ISNULL(ACO.明细区域,'') != ''                                                 
  LEFT JOIN  ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.名称=L.FNAME AND ISNULL(ACL.明细区域,'') != ''                                                                                    
  INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory              
- LEFT JOIN  dbo.T_BAS_ASSISTANTDATAENTRY_L assl ON assl.FENTRYID= a.F_CREDITCLASSIFICATIONTEXT
+ LEFT JOIN  dbo.T_BAS_ASSISTANTDATAENTRY_L assl ON assl.FENTRYID= I.F_CreditClassification
  WHERE                                                           
 1=1 AND                                                          
 A.FID NOT IN(