This commit is contained in:
余宇波 2025-09-23 11:52:28 +08:00
parent ba5ff140bd
commit ad7cf756bf

View File

@ -1,19 +1,13 @@
/****** Object: StoredProcedure [dbo].[GetOrderData] Script Date: 2025/8/20 10:19:00 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
--EXEC [GetOrderData] 'Ö麣ÅÉŵ','2025-01-01','2025-06-30'
ALTER PROCEDURE [dbo].[GetOrderData]
(
@FSaleOrgIdName nvarchar(1000),
@FSDate nvarchar(1000),
@FEDate nvarchar(1000),
@FPaperContract NVARCHAR(500)='',
@QuYu NVARCHAR(500)=''
@QuYu NVARCHAR(500)='' ,
@KH NVARCHAR(500)
)
as
DECLARE @FSaleOrgId nvarchar(1000);
@ -287,7 +281,7 @@ A.FID NOT IN(
AND(@FSaleOrgIdName = '' Or A.FSALEORGID = @FSaleOrgId)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
AND (ISNULL(@FEDate,'') = '' or A.FAPPROVEDATE < @FEDateDate)
AND A.FDocumentStatus = 'C'
AND A.FDocumentStatus = 'C' AND(@KH = '' Or I.FNUMBER = @KH)
AND A.FManualClose <> '1'
AND B.FManualRowClose <> '1'
AND A.F_contractnumber NOT LIKE 'Z%'
@ -321,11 +315,11 @@ LEFT JOIN #RETURNSTOCK AA ON AA.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
--LEFT JOIN T_SAL_ORDER T2 on T1.FID = T2.FID
LEFT JOIN T_SAL_ORDER T3 on T3.FBILLNO = T1.FSRCBILLNO
WHERE T1.FSRCTYPE = 'SAL_SaleOrder'
)G ON A.FENTRYID = G.FENTRYID AND A.[ºÏͬ×ܼÛ]<0
SELECT T1.FENTRYID,T3.F_CONTRACTNUMBER FROM T_SAL_ORDERENTRY_R T1
--LEFT JOIN T_SAL_ORDER T2 on T1.FID = T2.FID
LEFT JOIN T_SAL_ORDER T3 on T3.FBILLNO = T1.FSRCBILLNO
WHERE T1.FSRCTYPE = 'SAL_SaleOrder'
)G ON A.FENTRYID = G.FENTRYID AND A.[ºÏͬ×ܼÛ]<0
ORDER BY fid,FENTRYID ,FSHARERATE