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

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

@@ -154,6 +154,9 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
   A.FID ,                                                                              
  A.FBILLNO ,                                                                  
  B.FENTRYID ,  
+ a.F_INVOICEAMOUNT  '开票金额',
+ j.FBILLALLAMOUNT-  a.F_INVOICEAMOUNT  '未开票金额',
+
  ISNULL(N.FSHARERATE,100) AS FSHARERATE,
  F.FALLAMOUNT_LC ,                                                                                               
  MONTH(A.FApproveDate) AS '月份' --销售订单-单据头-日期-对应的月份                                                                              
@@ -211,7 +214,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
              ELSE '区域线' END AS '业绩类型'                         
  ,CASE WHEN N.FSHARERATE is null THEN '100' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as '业绩分摊比例' --销售订单-业绩分摊单-分摊比例                                                                      
  , b.F_ProjectProposal AS '项目方案类型'             
- ,'' AS '收款金额' --待定 收款金额                                                                              
+  ,a.F_Amount AS '收款金额' --待定 收款金额                                                                              
  , CAST( J.FEXCHANGERATE AS REAL) AS '汇率' --销售订单-单据头-汇率                                                                                
  ,H.F_Province AS '项目所属省份' --字段名改成“项目所属省份”来自于CRM系统商机，ERP商机需要增加文本字段对应                                                                              
  ,h.F_City AS '项目所属城市' --字段名改成“项目所属城市”来自于CRM系统商机，ERP商机需要增加文本字段对应                                                                              
@@ -293,10 +296,10 @@ AND A.F_contractnumber NOT LIKE 'Z%'
  ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)) * isnull(A.FSHARERATE,100)/100 ,2) AS '已交货金额-含退货' --2024-11-20沟通增加销售定关联的（AS发货金额-AU退货金额）*业绩分摊比例                          
  ,B.FQTY - AR.FDeliQty  AS '未交货数' --数量-已交货数                                                                                  
  , round( (A.FALLAMOUNT_LC - ISNULL(P.FAMOUNT,0) +ISNULL(Q.FAMOUNT,0))* isnull(A.FSHARERATE,100)/100,2)   as '未发货金额'--(销售订单价税合计本位币-发货通知单金额+退货通知单金额)*分摊比例
-,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '已开票数量' --开票数量，取销售出库单关联的蓝字应收单-退货单关联的红字应收单                                  
+--,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '已开票数量' --开票数量，取销售出库单关联的蓝字应收单-退货单关联的红字应收单                                  
- ,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '开票金额'--销售订单关联的（蓝字应收单金额-红字应收单金额）*分摊比例                                                                                      
+ --,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '开票金额'--销售订单关联的（蓝字应收单金额-红字应收单金额）*分摊比例                                                                                      
- ,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS '未开票数量' --AV已交货数-BB已开票数量                                                                              
+ --,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS '未开票数量' --AV已交货数-BB已开票数量   
- ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS '未开票金额' --(AW已交货金额-BC开票金额)*分摊比例 
+ --,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS '未开票金额' --(AW已交货金额-BC开票金额)*分摊比例 
  ,ISNULL(G.F_CONTRACTNUMBER,'') AS '源订单号'    ,CONVERT(DECIMAL(18,2),0)  AS 分摊金额                                           
  INTO #TEMP1                                                                              
  FROM #TEMP4 A   
@@ -306,7 +309,7 @@ LEFT JOIN  #SAL P ON P.FENTRYID = A.FENTRYID  --
 LEFT JOIN  #RETURN q ON q.FENTRYID = A.FENTRYID  --退货通知单                                                                              
 LEFT JOIN #OUTSTOCK R ON R.FENTRYID = A.FENTRYID --销售出库单                                                                              
 LEFT JOIN #RETURNSTOCK AA ON AA.FENTRYID = A.FENTRYID   --销售退货单                                                                              
-LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --应收单                                                                                                                                                
+--LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --应收单                                                                                                                                                
 LEFT JOIN #TEMP2 AD ON AD.FID = A.FID                             
 LEFT JOIN (
 	SELECT T1.FENTRYID,T3.F_CONTRACTNUMBER FROM T_SAL_ORDERENTRY_R T1