This commit is contained in:
余宇波 2025-08-14 15:48:04 +08:00
parent 80ad32cb15
commit 8b1e081a06
2 changed files with 17 additions and 12 deletions

View File

@ -91,9 +91,9 @@ SELECT A.FID [
SELECT plan1.FID ,CASE
WHEN X.FNAME LIKE '%协议付款%' THEN NULL
WHEN X.FNAME LIKE '%预付款%' THEN CONVERT(NVARCHAR(20), AA.FAPPROVEDATE, 120)
WHEN X.FNAME LIKE '%货到收款%' THEN DATEADD(DAY, plan1.F_DAY, CK.F_SFSIGNATURETIME)
WHEN X.FNAME LIKE '%货到收款%' THEN DATEADD(DAY, plan1.F_DAY,ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime))
WHEN X.FNAME LIKE '%货到票到收款%' THEN DATEADD(DAY, plan1.F_DAY,FP.FAPPROVEDATE)
WHEN X.FNAME LIKE '%款到发货%' THEN DATEADD(DAY, plan1.F_DAY, CK.F_SFSIGNATURETIME)
WHEN X.FNAME LIKE '%款到发货%' THEN DATEADD(DAY, plan1.F_DAY,ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime))
WHEN X.FNAME LIKE '%质保金%' THEN DATEADD(DAY, plan1.F_DAY,AA.F_XMYSSJ)
WHEN (X.FNAME LIKE '%调试完成%' OR X.FNAME LIKE '%项目验收%') THEN DATEADD(DAY,ISNULL(plan1.F_DAY,0), AA.F_XMYSSJ)
@ -109,7 +109,7 @@ SELECT A.FID [
LEFT JOIN
T_SAL_ORDERPLAN plan1 WITH(NOLOCK) ON plan1.FID=aa.FID
LEFT JOIN T_BD_RecCondition_L X WITH(NOLOCK) ON X.FID = plan1.F_RecConditionId
LEFT JOIN (SELECT MAX(F_SFSIGNATURETIME) F_SFSIGNATURETIME ,F_CONTRACTNUMBER,FSALEORGID
LEFT JOIN (SELECT MAX(F_SFSIGNATURETIME) F_SFSIGNATURETIME ,F_CONTRACTNUMBER,FSALEORGID,MAX(F_SigningTime) F_SigningTime
FROM T_SAL_OUTSTOCK WITH(NOLOCK)
WHERE F_CONTRACTNUMBER = a.F_CONTRACTNUMBER AND FSALEORGID = a.FSALEORGID
GROUP BY F_CONTRACTNUMBER,FSALEORGID
@ -394,7 +394,6 @@ WHERE T0.FREDBLUE=0 AND aa1.fid=
WHEN []>0
THEN ([]-[退]-[K3整单累计退货金额()]/ )*[]*0.01*[]*0.01 - []*[]*0.01 +[] ELSE 0 END ;
UPDATE [ZRP_YingShouMingXi_yuyubo] SET []=NULL
WHERE [] < 0
@ -403,6 +402,11 @@ update [ZRP_YingShouMingXi_yuyubo] set
,[]=CASE WHEN [] IS NOT NULL AND [] <= GETDATE() AND [] >'1990-01-01' AND []>0
THEN [] ELSE 0 END;
UPDATE [ZRP_YingShouMingXi_yuyubo] set
[]=[]
WHERE []>[];
--WHERE [ID]=110181;
update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END
@ -432,7 +436,8 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET
,[5]=CASE WHEN []> 60 THEN (([]-[退]-[K3整单累计退货金额()]/)*[]*0.01 -[])*[]*0.01 +[] ELSE 0 END
update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN ([] IS not NULL ) OR ([]=0 AND []=0) THEN NULL ELSE [] END
,[]=CASE WHEN [] IS NOT NULL THEN 0 ELSE [] END
,[]=
([]-[退]-[K3整单累计退货金额()]/ )*[]*0.01*[]*0.01 - []*[]*0.01 +[] -ISNULL([],0)
,[]=CASE WHEN [] > 12 THEN '' ELSE '' END ;

View File

@ -312,20 +312,20 @@ FROM #PLChongDianZhuangHeTong ;
''
END AS 'ProjectPhase', --
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0)
ELSE
NULL
END AS 'OrderAllAmount', --
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0)
ELSE
NULL
END AS 'NotShipmentsAmount', --
CASE
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY B.FSEQ) = 1 THEN
WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN
(SELECT SUM([bbb].[]*BBB.) FROM dbo.ZRP_YingShouMingXi_yuyubo bbb WHERE a.FID=bbb.ID )
ELSE
NULL
@ -536,7 +536,7 @@ FROM #PLChongDianZhuangHeTong ;
ON H5.FMASTERID = A.FSPECIALRESON
LEFT JOIN
(
SELECT W2.FSID,
SELECT W2.FSBILLID,
SUM(W1.FALLAMOUNT_LC) AS 'FALLAMOUNT_LC'
FROM
(
@ -551,9 +551,9 @@ FROM #PLChongDianZhuangHeTong ;
JOIN T_SAL_DELIVERYNOTICEENTRY_LK W2
ON W1.FENTRYID = W2.FENTRYID
WHERE W2.FSTABLENAME = 'T_SAL_ORDERENTRY'
GROUP BY W2.FSID
GROUP BY W2.FSBILLID
) H6 --
ON B.FENTRYID = H6.FSID
ON B.FID = H6.FSBILLID
LEFT JOIN
(
SELECT W2.FSID,
@ -673,7 +673,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL
SELECT fid,AllAmount,TaxPrice,CurrentSettledUpset1,CurrentSettledUpset1*aaa.Quantity,CurrentSettledUpset1,CurrentSettledUpset2,[Difference],TotalSpread,TotalSpreadYiBiao, * FROM #tempDaBiao aaa
--WHERE TableName IN ('#PLChongDianZhuangHeTong','XNChongDianZhuangHeTong')
WHERE AAA.ContractNumber ='C202501090025'
WHERE AAA.ContractNumber ='C202506250025'
AND aaa.Date>='2025-01-01'
--AND AAA.FSALEORGID=100302
--WHERE aaa.fid=208563