diff --git a/派诺报表SQL文件/销售执行统计表存储过程.sql b/派诺报表SQL文件/销售执行统计表存储过程.sql index 2ebeb08..93ff2d3 100644 --- a/派诺报表SQL文件/销售执行统计表存储过程.sql +++ b/派诺报表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(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¿ªÆ±½ð¶î)*·Ö̯±ÈÀý +--,CAST( ISNULL(AB.FQTY,0) 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ÒÑ¿ªÆ±ÊýÁ¿ + --,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