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

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

@@ -169,7 +169,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  ,c.FNAME as '购货单位' --销售订单-单据头-客户     
  ,CONVERT(VARCHAR(10), A.FDate,23) AS '签订日期'    
  ,CONVERT(VARCHAR(10), A.FApproveDate,23) AS '审核日期' --销售订单-单据头-审核日期                                                                              
- ,A.F_contractnumber AS '땐데뵀'--饋簡땐데-데앴庫-笭醴북谿뵀                                                                
+ ,A.F_contractnumber AS '纸质合同号'--销售订单-单据头-纸质合同号                                                                
  ,E.FNUMBER AS '产品代码'                                                              
  ,d.FNAME as '产品名称' --销售订单-单据体-物料名称                                                                              
  ,d.FSPECIFICATION as '规格型号'--销售订单-单据体-规格型号                                
@@ -242,7 +242,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
     END AS '数量台'       
 
 
- ,AE.FDATAVALUE AS '북谿잚謹'                 
+ ,AE.FDATAVALUE AS '合同类型'   
+  ,assl.FDATAVALUE '客户信用及分类'
  INTO #TEMP4                      
  FROM T_SAL_ORDER A --销售订单表头                                            
  INNER JOIN T_BAS_ASSISTANTDATAENTRY HT ON A.F_ORDERCATEGORY = HT.FMASTERID -- 关联辅助资料查询合同的编码                                                                  
@@ -272,7 +273,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
  LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID --AND N.FID IN (SELECT FID FROM T_PerformanceSharing WHERE FDOCUMENTSTATUS = 'C' )                                                                                          
  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                
+ 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
  WHERE                                                           
 1=1 AND                                                          
 A.FID NOT IN(