This commit is contained in:
2025-06-27 15:40:30 +08:00
parent f030c3e473
commit 3e5c4ca173
4 changed files with 24 additions and 8 deletions

View File

@@ -119,7 +119,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' )
--<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>ϸ<EFBFBD>ij<EFBFBD><EFBFBD><EFBFBD>׮ϵͳ<EFBFBD><EFBFBD>ͬCS<EFBFBD><EFBFBD>CW
SELECT A.FBILLNO AS 'AFBILLNO',
'CDZ' F_ORDERTYPE,
'CDZYB' F_ORDERTYPE,
CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
MONTH(A.FDATE) AS 'Month', --<EFBFBD>·<EFBFBD>
A.F_CONTRACTNUMBER AS 'ContractNumber', --ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>
@@ -176,7 +176,7 @@ WHERE
--<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>ϸ<EFBFBD>ij<EFBFBD><EFBFBD><EFBFBD>׮ϵͳ<EFBFBD><EFBFBD>ͬCS<EFBFBD><EFBFBD>CW
SELECT A.FBILLNO AS 'AFBILLNO',
A.F_ORDERTYPE,
'CDZXT' F_ORDERTYPE,
CONVERT(NVARCHAR, A.FDATE, 23) AS 'Date', --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
MONTH(A.FDATE) AS 'Month', --<EFBFBD>·<EFBFBD>
A.F_CONTRACTNUMBER AS 'ContractNumber', --ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>
@@ -325,12 +325,14 @@ SELECT AAA.TableName, A.FBILLNO AS 'AFBILLNO',
H5.FDATAVALUE AS 'SpecialCauseType', --<EFBFBD>ؼ<EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
A.FCRMSPECIALPRICINGREASON AS 'CRMSpecialCause', --CRM<EFBFBD>ؼ<EFBFBD>ԭ<EFBFBD><EFBFBD>
CASE
WHEN AAA.F_ORDERTYPE = 'YB' THEN
WHEN (AAA.F_ORDERTYPE = 'YB' or AAA.F_ORDERTYPE = 'CDZYB') THEN
B.F_SETTLEMENTP
ELSE
NULL
END AS 'CurrentSettledUpset1', --<EFBFBD><EFBFBD><EFBFBD>ڽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۣ<EFBFBD><EFBFBD>DZ<EFBFBD><EFBFBD><EFBFBD>
CASE
CASE
WHEN (AAA.F_ORDERTYPE = 'CDZXT') THEN
isnull(g.F_JSJ,0)* B.FQTY+isnull(A.F_KFYS,0)+isnull(F_SGCB,0)+isnull(F_SSRT,0)*800+isnull(F_SJRT,0)*800
WHEN AAA.F_ORDERTYPE = 'XT'
AND ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
CAST(ISNULL(A.F_VRYF_AMOUNT_YRR, 0) AS FLOAT)