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  '<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+ j.FBILLALLAMOUNT-  a.F_INVOICEAMOUNT  'δ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+
  ISNULL(N.FSHARERATE,100) AS FSHARERATE,
  F.FALLAMOUNT_LC ,                                                                                               
  MONTH(A.FApproveDate) AS '<EFBFBD>·<EFBFBD>' --<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>                                                                              
@@ -211,7 +214,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
              ELSE '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END AS 'ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'                         
  ,CASE WHEN N.FSHARERATE is null THEN '100' ELSE CONCAT( CAST ( N.FSHARERATE AS REAL),'%') END as 'ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>' --<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>-ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF>-<2D><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                      
  , b.F_ProjectProposal AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'             
- ,'' AS '<27>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD> <20>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>                                                                              
+  ,a.F_Amount AS '<27>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD> <20>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>                                                                              
  , CAST( J.FEXCHANGERATE AS REAL) AS '<27><><EFBFBD><EFBFBD>' --<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>-<2D><><EFBFBD><EFBFBD>ͷ-<2D><><EFBFBD><EFBFBD>                                                                                
  ,H.F_Province AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>ʡ<EFBFBD><CAA1>' --<2D>ֶ<EFBFBD><D6B6><EFBFBD><EFBFBD>ijɡ<C4B3><C9A1><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD>ʡ<EFBFBD>ݡ<EFBFBD><DDA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CRMϵͳ<CFB5>̻<EFBFBD><CCBB><EFBFBD>ERP<52>̻<EFBFBD><CCBB><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>ֶζ<D6B6>Ӧ                                                                              
  ,h.F_City AS '<27><>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' --<2D>ֶ<EFBFBD><D6B6><EFBFBD><EFBFBD>ijɡ<C4B3><C9A1><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CRMϵͳ<CFB5>̻<EFBFBD><CCBB><EFBFBD>ERP<52>̻<EFBFBD><CCBB><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>ֶζ<D6B6>Ӧ                                                                              
@@ -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 '<27>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>˻<EFBFBD>' --2024-11-20<32><30>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD>AS<41><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-AU<41>˻<EFBFBD><CBBB><EFBFBD><EFBFBD>*ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                          
  ,B.FQTY - AR.FDeliQty  AS 'δ<><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' --<2D><><EFBFBD><EFBFBD>-<2D>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>                                                                                  
  , round( (A.FALLAMOUNT_LC - ISNULL(P.FAMOUNT,0) +ISNULL(Q.FAMOUNT,0))* isnull(A.FSHARERATE,100)/100,2)   as 'δ<><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'--(<28><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD>˰<EFBFBD>ϼƱ<CFBC>λ<EFBFBD><CEBB>-<2D><><EFBFBD><EFBFBD>֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>+<2B>˻<EFBFBD>֪ͨ<CDA8><D6AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>
-,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '<27>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --<2D><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>۳<EFBFBD><DBB3>ⵥ<EFBFBD><E2B5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>-<2D>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>                                  
+--,CAST( ISNULL(AB.FQTY,0) AS REAL) AS '<27>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --<2D><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>۳<EFBFBD><DBB3>ⵥ<EFBFBD><E2B5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>-<2D>˻<EFBFBD><CBBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>                                  
- ,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '<27><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                                      
+ --,CAST(round( ISNULL(AB.FAMOUNT,0) * isnull(A.FSHARERATE,100)/100,2)  AS REAL)  AS '<27><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                                                                      
- ,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --AV<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>-BB<42>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>                                                                              
+ --,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --AV<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>-BB<42>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>   
- ,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --(AW<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-BC<42><43>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> 
+ --,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --(AW<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-BC<42><43>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> 
  ,ISNULL(G.F_CONTRACTNUMBER,'') AS 'Դ<><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'    ,CONVERT(DECIMAL(18,2),0)  AS <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>                                           
  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  --<2D>˻<EFBFBD>֪ͨ<CDA8><D6AA>                                                                              
 LEFT JOIN #OUTSTOCK R ON R.FENTRYID = A.FENTRYID --<2D><><EFBFBD>۳<EFBFBD><DBB3>ⵥ                                                                              
 LEFT JOIN #RETURNSTOCK AA ON AA.FENTRYID = A.FENTRYID   --<2D><><EFBFBD><EFBFBD><EFBFBD>˻<EFBFBD><CBBB><EFBFBD>                                                                              
-LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --Ӧ<>յ<EFBFBD>                                                                                                                                                
+--LEFT JOIN #RECE AB ON AB.FENTRYID = A.FENTRYID --Ӧ<>յ<EFBFBD>                                                                                                                                                
 LEFT JOIN #TEMP2 AD ON AD.FID = A.FID                             
 LEFT JOIN (
 	SELECT T1.FENTRYID,T3.F_CONTRACTNUMBER FROM T_SAL_ORDERENTRY_R T1