1
This commit is contained in:
@@ -67,7 +67,8 @@ BEGIN
|
||||
FROM T_IV_SALESIC T1
|
||||
WHERE (FSETTLEORGID = @FSaleOrgId OR ISNULL(@FSaleOrgId,'') = '')
|
||||
AND FCUSTOMERID = @FCUSTID --<EFBFBD>ͻ<EFBFBD>
|
||||
AND FApproveDate >= '2025-01-01'
|
||||
AND FApproveDate >= '2025-01-01'
|
||||
AND FApproveDate >= @FSDATE
|
||||
AND FApproveDate < @EndDate
|
||||
AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH)
|
||||
AND FDOCUMENTSTATUS = 'C'
|
||||
@@ -79,6 +80,14 @@ BEGIN
|
||||
WHERE FDOCUMENTSTATUS = 'C'
|
||||
AND FApproveDate < @EndDate
|
||||
AND 1= @SFQJFWDZ
|
||||
UNION ALL
|
||||
--<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>
|
||||
SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ
|
||||
FROM T_SAL_ORDER
|
||||
WHERE FDOCUMENTSTATUS = 'C'
|
||||
AND FApproveDate >= @FSDATE
|
||||
AND FApproveDate < @EndDate
|
||||
AND 2= @SFQJFWDZ
|
||||
)a
|
||||
|
||||
|
||||
@@ -102,7 +111,7 @@ BEGIN
|
||||
,A.F_Amount AS <EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
,0 AS <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
,tmm.FOldNumber
|
||||
,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER
|
||||
,ROW_NUMBER() OVER(ORDER BY A.FApproveDate DESC,A.FID) AS NUMBER
|
||||
FROM T_SAL_ORDER A
|
||||
INNER JOIN (
|
||||
SELECT T1.FID,SUM(T1.FALLAMOUNT_LC) FBillAllAmount
|
||||
|
||||
@@ -57,7 +57,7 @@ FROM YingShouZhanKuanJY_GZTH A
|
||||
INNER JOIN (
|
||||
SELECT
|
||||
FID,
|
||||
ROW_NUMBER() OVER (ORDER BY FID) as row_num1
|
||||
ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) as row_num1
|
||||
FROM YingShouZhanKuanJY_GZTH
|
||||
) B On A.FID = B.FID
|
||||
|
||||
|
||||
Reference in New Issue
Block a user