From 28aeccbd3ef08c98d75f88e9f5c4e5b75bdcb350 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 21 Aug 2025 17:10:03 +0800 Subject: [PATCH] 11 --- 非C#代码文件/应收明细SQL.sql | 35 +++---------------------- 非C#代码文件/收款单核销流水存储过程.sql | 6 +++-- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 4cd0eff..a1959f8 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -283,7 +283,7 @@ GROUP BY F_PaperNumber, FSALEORGID UPDATE T1 SET [K3ۼƷ(λ)] = T2.[ۼƷ],[K3ۼ˻(λ)] = T2.[ۼ˻] FROM [ZRP_YingShouMingXi_yuyubo] T1 INNER JOIN ( - SELECT ͬ,SUM(ISNULL(,0)) AS [ۼƷ], SUM(ISNULL(˻,0)) AS [ۼ˻],SUM(ISNULL(רƱ,0)) AS [ۼרƱ],SUM(ISNULL(Ʊ,0)) AS [ۼƱ] + SELECT ͬ,SUM(ISNULL((ISNULL(۳,0)+ISNULL(,0))*˰,0)) AS [ۼƷ], SUM(ISNULL(˻,0)) AS [ۼ˻] FROM [oldk3seorder0701] GROUP BY ͬ ) T2 ON T1.ֽʺͬ = T2.ͬ @@ -360,7 +360,7 @@ update [ZRP_YingShouMingXi_yuyubo] set --UPDATE [ZRP_YingShouMingXi_yuyubo] set [̯]=[ܶ]; UPDATE [ZRP_YingShouMingXi_yuyubo] set [Ӧտϼ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS(([ۼ˻]+[K3ۼ˻(λ)]/+[ۼƵ])*[̯]*0.01) +[ӷ] ELSE 0 end -,[δܶ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS(([ۼƷ]+[K3ۼƷ(λ)]/)*[̯]*0.01) ELSE 0 end +,[δܶ]=CASE WHEN [ܶ]>0 then ABS([ܶ])-ABS(([ۼƷ]+[K3ۼƷ(λ)]/)*[̯]*0.01) ELSE 0 end --,[ʱ]='2022-01-01' --,[ʱ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN [ԤƵʱ] ELSE NULL END @@ -369,8 +369,8 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] set ,[ʵѳӦտϼ]=CASE WHEN [ܶ] >0 THEN ([ۼƷ]+[K3ۼƷ(λ)]-[ۼ˻]-[K3ۼ˻(λ)]/- [ۼƵ] )*[̯]*0.01+[ӷ] ELSE 0 end ,[Ŀ׶]= CASE WHEN [Ŀʱ]>='1990-01-01' AND [Ŀʱ] IS NOT NULL THEN '' WHEN [Ŀʱ]>='1990-01-01' AND [Ŀʱ] IS NOT NULL THEN '' - WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ],0) = 0 THEN 'δ' -WHEN ISNULL( [ۼƷ],0) = ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ],0) THEN '' END + WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ]+[K3ۼƷ(λ)],0) = 0 THEN 'δ' +WHEN ISNULL( [ۼƷ]+[K3ۼƷ(λ)],0) >= ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ]+[K3ۼƷ(λ)],0) THEN '' END ,[ӷ]=[ӷ]*ISNULL([տ̯],100)*0.01; @@ -530,33 +530,6 @@ FROM WHERE A.FID=[ZRP_YingShouMingXi_yuyubo].۵ID AND [ͬ] IN ('׮ϵͳ','ܴװ','ϵͳ','ϵͳʩͬ') - - -- UPDATE [ZRP_YingShouMingXi_yuyubo] - -- SET ܶ=0,[ܶ(ԭ)]=0,ۼƷ=0,ۼ˻=0, ۼƷ = 0 ,ۼƿƱ= 0,BillingAmount=0 - --from ( - -- SELECT CASE WHEN ROW_NUMBER() OVER(PARTITION BY ۵ID ORDER BY ۵ID ) = 1 THEN FBILLNO - -- END AS ,* FROM [ZRP_YingShouMingXi_yuyubo] - - -- ) B - -- WHERE YingShouZhanKuanMX_GZTH.FID=B.FID AND YingShouZhanKuanMX_GZTH.FENTRYID=b.FENTRYID AND b. IS null - - - ---UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ͻö]=bb.FCREDITAMOUNT ---FROM (SELECT FCreditAmount,b.FUseOrgId,b.FNUMBER FROM T_CRE_CUSTARCHIVESENTRY a LEFT JOIN T_BD_CUSTOMER b ON a.FObjectId=b.FCUSTID ---WHERE FCreditStatus='A' AND FRowAuditStatus='A') bb ---WHERE bb.FNUMBER=[ͻ] - - --SELECT TOP 100 []=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23)+'---'+CONVERT(NVARCHAR(100),ROUND(B.FBillAllAmount_LC,2)),',')) AS '' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) - --INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID - --WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.[ֽʺͬ]),'') - - ---- ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) - ----INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID - ----WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0) - --FROM [ZRP_YingShouMingXi_yuyubo] A - - --update [ReceivablesDetailsTable] set [F_001]=b.[۵ID],[F_002]=b.[Ա],[F_003]=b.[SBU],[F_004]=B.[ϸ],[F_005]=b.[λ],[F_006]=b.[˾] --,[F_007]=[ͻ],[F_008]=[ֽʺͬ],[F_009]=[Ŀ],[F_010]=[ܶ],[F_011]=[ǩ],[F_012]=CONVERT(NVARCHAR(20),[],23),[F_013]=[տ],[F_014]=CONVERT(NVARCHAR(20),[],23) --,[F_015]=[Ӧձ],[F_016]=CONVERT(NVARCHAR(20),[Ʊ],23),[F_017]=[ۼƷ],[F_018]=[ۼ˻],[F_019]=[ۼƿƱ],[F_020]=[ۼƵ],[F_021]=[Ӧտϼ] diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 477aeab..4ad1721 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -397,8 +397,10 @@ INTO #temp222 FROM T_AR_RECMacthLog a LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID LEFT JOIN T_BAS_BILLTYPE c ON b.FSOURCETYPE=c.FBILLTYPEID -WHERE a.FMATCHMETHODID=30 - AND a.FVERIFYSEQ NOT IN +WHERE +--a.FMATCHMETHODID=30 +-- AND + a.FVERIFYSEQ NOT IN (SELECT DISTINCT FVERIFYSEQ from T_AR_RECMacthLog oo LEFT JOIN T_AR_RECMACTHLOGENTRY ll ON oo.FID=ll.FID LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID WHERE FBILLFORMID='AR_RECEIVEBILL'