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

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

@@ -142,7 +142,7 @@ 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 CC.F_correlation = '1'
+ WHERE CC.F_correlation = '1'  OR a.F_CONTRACTNUMBER IN ('CYJSQD2024123118401','CYJSQD2025011518501')
  --WHERE A.FSALEORGID = 100302 AND                                                    
  --(
  --  CC.F_correlation = '1'
@@ -208,7 +208,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  ELSE ''                                
  END                                
  as '直销还是经销商'                                                                               
- ,CASE WHEN b.F_specialoffer = '1' THEN '是' ELSE '否' end AS '是否特价'--销售订单-单据分录-是否特价                                                                         
+ ,CASE WHEN b.F_specialoffer = '1' AND (F_YKQC_CHECKBOX_QTR='0' OR F_YKQC_CHECKBOX_QTR IS NULL) THEN '是' ELSE '否' end AS '是否特价'--销售订单-单据分录-是否特价                                                                         
  ,CASE WHEN (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.区域 ELSE ACO.区域  END) LIKE '%产品线%' OR                                
              (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.区域 ELSE ACO.区域  END) LIKE '%决策团队%'OR                                                                        
              (CASE WHEN ISNULL(O.FNAME,'')='' THEN ACL.区域 ELSE ACO.区域  END) LIKE '%三电产品线%'