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

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

@@ -30,7 +30,7 @@ as
   -- @FEDate + 1天                      
 SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);                      
                                                                                                
-  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT'                                                                               
+  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) AS 'FAMOUNT'                                                                               
   INTO #SAL                                                                              
   FROM T_SAL_DELIVERYNOTICE A                                                                               
   INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                                                                               
@@ -45,7 +45,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
   GROUP BY D.FENTRYID                                                                              
                                                                               
                                                                               
-  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT'                                                                               
+  SELECT  D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) AS 'FAMOUNT'                                                                               
   INTO #RETURN                                                                              
   FROM T_SAL_RETURNNOTICE  A                                                                               
   INNER JOIN T_SAL_RETURNNOTICEENTRY  B ON A.FID = B.FID                                                                               
@@ -93,16 +93,18 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
   GROUP BY F.FENTRYID                                                                          
                                                                             
                                            
-  SELECT  b.FORDERENTRYID as 'FENTRYID',sum(b.FPriceQty) AS 'FQTY',sum(b.FALLAMOUNT) AS 'FAMOUNT'                                                                            
-  INTO #RECE                    
-  FROM t_AR_receivable A               
-  INNER JOIN t_AR_receivableENTRY B ON A.FID = B.FID                                                                                 
-  WHERE A.FDOCUMENTSTATUS= 'C'      
-  AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                      
-  AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                      
-  AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)  
-  AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
-  GROUP BY b.FORDERENTRYID                                                                                                                                                           
+  --SELECT  b.FORDERENTRYID as 'FENTRYID',sum(bF.FQty) AS 'FQTY',sum(bF.FRECAMOUNT_E) AS 'FAMOUNT'                                                                            
+  --INTO #RECE                    
+  --FROM t_AR_receivable A               
+  ----INNER JOIN t_AR_receivableENTRY B ON A.FID = B.FID     
+  --LEFT JOIN dbo.T_AR_RECEIVEBILLENTRY bF on A.FID = BF.FID --饋簡땐데깊竟   
+
+  --WHERE A.FDOCUMENTSTATUS= 'C'      
+  --AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)                                      
+  --AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)                                                      
+  --AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)  
+  --AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
+  --GROUP BY b.FORDERENTRYID                                                                                                                                                           
       
  SELECT   a.FID, STUFF(                                                                              
  (                                    
@@ -300,10 +302,11 @@ AND A.F_contractnumber NOT LIKE 'Z%'
  --,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已开票数量   
  --,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 ·Ö̯½ð¶î                                           
+ ,ISNULL(G.F_CONTRACTNUMBER,'') AS '都땐데뵀'    ,CONVERT(DECIMAL(18,2),0)  AS 롸覡쏜띨 ,0   rownum                                        
  INTO #TEMP1                                                                              
  FROM #TEMP4 A   
 LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --销售订单表体   
+LEFT JOIN dbo.T_SAL_ORDERENTRY_F bF on a.FENTRYID = bF.FENTRYID --饋簡땐데깊竟   
 LEFT JOIN T_SAL_ORDERENTRY_R AR ON AR.FENTRYID = A.FENTRYID                                                              
 LEFT JOIN  #SAL P ON P.FENTRYID = A.FENTRYID  --发货通知单                                                                               
 LEFT JOIN  #RETURN q ON q.FENTRYID = A.FENTRYID  --退货通知单                                                                              
@@ -325,13 +328,20 @@ LEFT JOIN (
  WHERE #TEMP1.FBILLNO=b.FBILLNO AND 订单总额 <>0
 
   
-  --UPDATE #TEMP1 SET  rownum=b.rownum2
-  --FROM (SELECT ROW_NUMBER() OVER (PARTITION BY FID, FENTRYID ORDER BY FENTRYID) AS rownum2, FID, FENTRYID FROM   #TEMP1  ) b
-  --WHERE #TEMP1.FID=b.fid AND #TEMP1.FENTRYID=b.FENTRYID
+  UPDATE #TEMP1 SET  rownum=b.rownum2
+  FROM (SELECT ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID,FENTRYID) AS rownum2, FID, FENTRYID FROM   #TEMP1  ) b
+  WHERE #TEMP1.FID=b.fid AND #TEMP1.FENTRYID=b.FENTRYID
+
+  UPDATE #TEMP1 SET 澗운쏜띨=0,역튿쏜띨=0,灌역튿쏜띨=0
+  WHERE rownum>1;
   
   UPDATE #TEMP1 SET  合同总价=合同总价+(订单总额- 分摊金额 )                    
   WHERE  订单总额<>0               
         
+UPDATE #TEMP1 SET 澗운쏜띨=澗운쏜띨*땐데굶貫귑뚝훙췽귑삠쪽,역튿쏜띨=역튿쏜띨*땐데굶貫귑뚝훙췽귑삠쪽,땐데悧띨=땐데悧띨*땐데굶貫귑뚝훙췽귑삠쪽
+FROM ZZV_XiaoShouHuiLv b
+WHERE #TEMP1.FID=b.饋簡땐데ID
+
 IF(@QuYu='')
   SELECT * FROM #TEMP1 ORDER BY fid,FENTRYID ,FSHARERATE DESC
  ELSE
@@ -339,7 +349,7 @@ IF(@QuYu='')
   
 
 drop table #TEMP2  
-drop table #RECE  
+--drop table #RECE  
 drop table #RETURNSTOCK  
 drop table #OUTSTOCK  
 drop table #RETURN