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),
@FSDate nvarchar(1000),
@FEDate nvarchar(1000)
@FEDate nvarchar(1000),
@FPaperContract NVARCHAR(500)=''
)
as
DECLARE @FSaleOrgId nvarchar(1000);
@ -39,6 +40,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @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
@ -52,7 +54,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
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 (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY D.FENTRYID
@ -68,7 +71,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
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 (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'
@ -83,7 +87,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
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 (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_CONTRACTNUMBER=@FPaperContract OR @FPaperContract='')
GROUP BY F.FENTRYID
@ -94,7 +99,8 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
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 (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND (a.F_PAPERCONTRACT=@FPaperContract OR @FPaperContract='')
GROUP BY b.FORDERENTRYID
SELECT a.FID, STUFF(
@ -111,7 +117,14 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
FOR XML PATH('')
),1 ,1, '')
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='')
--
@ -137,11 +150,11 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
SELECT
A.FID ,
A.FBILLNO,
B.FENTRYID,
N.FSHARERATE,
F.FALLAMOUNT_LC,
A.FID ,
A.FBILLNO ,
B.FENTRYID ,
ISNULL(N.FSHARERATE,100) AS FSHARERATE,
F.FALLAMOUNT_LC ,
MONTH(A.FApproveDate) AS '月份' -----
,CASE WHEN ISNULL(O.FNAME,'')='' THEN L.FNAME
ELSE O.FNAME END as '业绩分摊后销售员' -- 业绩分摊后销售员
@ -263,8 +276,9 @@ A.FID NOT IN(
AND A.FDocumentStatus = 'C'
AND A.FManualClose <> '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
A.*
,AD. as '付款条件'----+++(%),,0
@ -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( 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 'Ô­¶©µ¥ºÅ'
,ISNULL(G.F_CONTRACTNUMBER,'') AS 'Ô´¶©µ¥ºÅ'
INTO #TEMP1
FROM #TEMP4 A
LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --