diff --git a/派诺报表SQL文件/销售执行统计表存储过程.sql b/派诺报表SQL文件/销售执行统计表存储过程.sql index 88bba6e..a94ba38 100644 --- a/派诺报表SQL文件/销售执行统计表存储过程.sql +++ b/派诺报表SQL文件/销售执行统计表存储过程.sql @@ -24,7 +24,7 @@ as -- @FEDate + 1Ìì SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); - SELECT D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) 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 @@ -32,14 +32,14 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID 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 (@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 D.FENTRYID - SELECT D.FENTRYID,sum(b.fqty) AS 'FQTY',sum(E.FAllAmount_LC) 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 @@ -47,14 +47,14 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID 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 (@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 D.FENTRYID - SELECT F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' + SELECT F.FENTRYID,SUM(b.FREALQTY) AS 'FQTY',SUM(G.FALLAMOUNT_LC) AS 'FAMOUNT' INTO #OUTSTOCK FROM T_SAL_OUTSTOCK A INNER JOIN T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID @@ -64,13 +64,13 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID 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 (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId) + AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate) + AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate) AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='') GROUP BY F.FENTRYID - SELECT F.FENTRYID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' + SELECT F.FENTRYID,SUM(b.FREALQTY) AS 'FQTY',SUM(G.FALLAMOUNT_LC) AS 'FAMOUNT' INTO #RETURNSTOCK FROM T_SAL_RETURNSTOCK A INNER JOIN T_SAL_RETURNSTOCKENTRY B ON A.FID = B.FID @@ -80,9 +80,9 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); INNER JOIN T_SAL_RETURNNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID 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 (@FSaleOrgIdName = '' OR A.FSALEORGID = @FSaleOrgId) + AND (ISNULL(@FSDate,'') = '' OR A.FAPPROVEDATE > @FSDateDate) + AND (ISNULL(@FEDate,'') = '' OR A.FAPPROVEDATE < @FEDateDate) AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='') GROUP BY F.FENTRYID @@ -172,11 +172,20 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate); ,d.FNAME as '²úÆ·Ãû³Æ' --ÏúÊÛ¶©µ¥-µ¥¾ÝÌå-ÎïÁÏÃû³Æ ,d.FSPECIFICATION as '¹æ¸ñÐͺÅ'--ÏúÊÛ¶©µ¥-µ¥¾ÝÌå-¹æ¸ñÐͺŠ,CONCAT(A.F_contractnumber,d.FSPECIFICATION ) as '¶©µ¥¹æ¸ñÐͺÅ' --H¡¾¶©µ¥ºÅ¡¿(¶ÔÓ¦Ö½ÖʺÏͬºÅ)+J¡¾Ðͺţܹæ¸ñ£Ü±ê×¼¡¿ - ,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != '' - THEN CONCAT(b.F_ProjectProposal,'µÄÊ£Óಿ·Ö') ELSE E.F_114 END AS 'ÐͺŷÖÀà' --ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-ÐͺŴóÀà - ,CASE WHEN E.FNUMBER LIKE 'L%' AND HT.FNUMBER = 'SX' AND ISNULL(b.F_ProjectProposal,'') != '' - THEN CONCAT(b.F_ProjectProposal,'µÄÊ£Óಿ·Ö') ELSE E.F_115 END AS '²úÆ··ÖÀà'--ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-²úÆ·´óÀà -,E.F_116 AS '²úÆ·Ïß'--ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-²úÆ·Ïß + ,CASE WHEN E.F_114 IS NOT NULL AND E.F_114 !=' ' AND E.F_114 !='' THEN E.F_114 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '´¢ÄÜ¡¢Î¢µç·ç¡¢¹â´¢³äÊ£Óಿ·Ö' + WHEN E.FNUMBER IN ('B','BS') THEN 'BMS²úÆ·ÏßÊ£Óಿ·Ö' + WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '³äµç׮ʣÓಿ·Ö' + WHEN E.FNUMBER not IN ('E','ES','NWE','HKE','BS') THEN '' ELSE E.F_114 END AS 'ÐͺŷÖÀà' --ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-ÐͺŴóÀà + ,CASE WHEN E.F_115 IS NOT NULL AND E.F_115 !=' ' AND E.F_115 !='' THEN E.F_115 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '´¢ÄÜ¡¢Î¢µç·ç¡¢¹â´¢³äÊ£Óಿ·Ö' +WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '³äµç׮ʣÓಿ·Ö' +WHEN E.FNUMBER IN ('B','BS') THEN 'BMS²úÆ·ÏßÊ£Óಿ·Ö' + WHEN E.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN '' + ELSE E.F_115 END AS '²úÆ··ÖÀà'--ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-²úÆ·´óÀà +, CASE WHEN E.F_116 IS NOT NULL AND E.F_116 !=' ' AND E.F_116 !='' THEN E.F_116 WHEN E.FNUMBER IN ('E','ES','NWE','HKE') THEN '´¢ÄÜ¡¢Î¢µç·ç¡¢¹â´¢³ä' + WHEN E.FNUMBER IN ('C','CS','CW','CY') THEN '³äµç×®ÒµÎñ' + WHEN E.FNUMBER IN ('B','BS') THEN 'BMS²úÆ·Ïß' + WHEN E.FNUMBER NOT IN ('E','ES','NWE','HKE','BS') THEN '' + ELSE E.F_116 END AS '²úÆ·Ïß'--ÎïÁϵµ°¸-×Ô¶¨Òå×Ö¶Î-²úÆ·Ïß --,'' as 'ÒµÎñÏß' --´ý¶¨£¬È·ÈÏÈ¡ÊýÂß¼­ ,CASE WHEN A.F_VRYF_Combo_lsn LIKE '%XTZHT%' THEN 'ϵͳÖ÷ºÏͬ' WHEN A.F_VRYF_Combo_lsn LIKE '%SXTXS%' THEN 'ËæϵͳÏúÊÛ'