This commit is contained in:
余宇波 2025-08-04 11:15:38 +08:00
parent 9fb0a496bb
commit 8bdd307fe1

View File

@ -11,7 +11,8 @@ ALTER PROCEDURE [dbo].[GetOrderData]
( (
@FSaleOrgIdName nvarchar(1000), @FSaleOrgIdName nvarchar(1000),
@FSDate nvarchar(1000), @FSDate nvarchar(1000),
@FEDate nvarchar(1000) @FEDate nvarchar(1000),
@FPaperContract NVARCHAR(500)=''
) )
as as
DECLARE @FSaleOrgId nvarchar(1000); DECLARE @FSaleOrgId nvarchar(1000);
@ -39,6 +40,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY D.FENTRYID GROUP BY D.FENTRYID
@ -53,6 +55,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY D.FENTRYID GROUP BY D.FENTRYID
@ -69,6 +72,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
GROUP BY F.FENTRYID 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'
@ -84,6 +88,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
GROUP BY F.FENTRYID GROUP BY F.FENTRYID
@ -95,6 +100,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId) AND (@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate) AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY b.FORDERENTRYID GROUP BY b.FORDERENTRYID
SELECT a.FID, STUFF( SELECT a.FID, STUFF(
@ -112,6 +118,13 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
),1 ,1, '') ),1 ,1, '')
INTO #TEMP2 INTO #TEMP2
FROM T_SAL_ORDER A WITH(NOLOCK) FROM T_SAL_ORDER A WITH(NOLOCK)
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_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
-- --
@ -138,10 +151,10 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
SELECT SELECT
A.FID , A.FID ,
A.FBILLNO, A.FBILLNO ,
B.FENTRYID, B.FENTRYID ,
N.FSHARERATE, ISNULL(N.FSHARERATE,100) AS FSHARERATE,
F.FALLAMOUNT_LC, F.FALLAMOUNT_LC ,
MONTH(A.FApproveDate) AS '月份' ----- MONTH(A.FApproveDate) AS '月份' -----
,CASE WHEN ISNULL(O.FNAME,'')='' THEN L.FNAME ,CASE WHEN ISNULL(O.FNAME,'')='' THEN L.FNAME
ELSE O.FNAME END as '业绩分摊后销售员' -- 业绩分摊后销售员 ELSE O.FNAME END as '业绩分摊后销售员' -- 业绩分摊后销售员
@ -264,6 +277,7 @@ A.FID NOT IN(
AND A.FManualClose <> '1' AND A.FManualClose <> '1'
AND B.FManualRowClose <> '1' AND B.FManualRowClose <> '1'
AND A.F_contractnumber NOT LIKE 'Z%' AND A.F_contractnumber NOT LIKE 'Z%'
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
SELECT SELECT
A.* A.*
@ -280,7 +294,7 @@ AND A.F_contractnumber NOT LIKE 'Z%'
,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 'Ô­śŠľĽşĹ' ,ISNULL(G.F_CONTRACTNUMBER,'') AS 'Ô´śŠľĽşĹ'
INTO #TEMP1 INTO #TEMP1
FROM #TEMP4 A FROM #TEMP4 A
LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID -- LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --