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, '') <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
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='')
--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>
@@ -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 '<EFBFBD>·<EFBFBD>' --<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD>·<EFBFBD>
,CASE WHEN ISNULL(O.FNAME,'')='' THEN L.FNAME
ELSE O.FNAME END as 'ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա' -- ҵ<><D2B5><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա
@@ -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.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> as '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>-<2D>տ<EFBFBD><D5BF>ƻ<EFBFBD>-<2D>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD>+<2B><><EFBFBD><EFBFBD>+<2B><><EFBFBD>족+Ӧ<>ձ<EFBFBD><D5B1><EFBFBD>(%),<2C><><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD>Ҫ<EFBFBD>á<EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>վ<EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ0<CEAA><30>
@@ -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 '<27><>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>'--<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>Ӧ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>
,CAST( ISNULL(P.FQTY,0)-isnull(q.FQTY,0) - ISNULL(AB.FQTY,0) AS REAL) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --AV<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD>-BB<42>ѿ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>
,round( (ISNULL(P.FAMOUNT,0)-isnull(q.FAMOUNT,0)- ISNULL(AB.FAMOUNT,0) ) * isnull(A.FSHARERATE,100)/100 ,2) AS 'δ<><CEB4>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>' --(AW<41>ѽ<EFBFBD><D1BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-BC<42><43>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD>)*<2A><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>
,ISNULL(G.F_CONTRACTNUMBER,'') AS 'ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,ISNULL(G.F_CONTRACTNUMBER,'') AS 'Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
INTO #TEMP1
FROM #TEMP4 A
LEFT JOIN T_SAL_orderentry b on a.FENTRYID = B.FENTRYID --<2D><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>