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

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

@@ -142,17 +142,18 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID                                                    
  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                                                    
- (
-   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)                                                      
- AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE< @FEDateDate) )                        
+ WHERE CC.F_correlation = '1'
+ --WHERE A.FSALEORGID = 100302 AND                                                    
+ --(
+ --  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)                                                      
+ --AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE< @FEDateDate) )                        
                                                                                
                                                                               
  SELECT