diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 540550d..f66583c 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -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 ; diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql index 5a21d7d..0474471 100644 --- a/非C#代码文件/特价明细表SQL22.sql +++ b/非C#代码文件/特价明细表SQL22.sql @@ -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