From ec45e4efb200845b1b675eda6bdc642092e43ca5 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Wed, 20 Aug 2025 10:15:20 +0800 Subject: [PATCH] 11 --- 非C#代码文件/应收明细SQL.sql | 16 ++++++++++++++-- 非C#代码文件/收款单核销流水存储过程.sql | 9 +++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index c2b34da..4c68f78 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -313,6 +313,14 @@ update [ZRP_YingShouMingXi_yuyubo] set FROM (SELECT DISTINCT ACO22.,ACO22.ϸ,ACO22. FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b WHERE []=b.; + -- ΪӦտרС顱SBUϸҲӦտרС顱 2025-08-19 Ƽ + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET SBU='ӦտרС',[ϸ]='ӦտרС' + WHERE []='ӦտרС'; + + + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [2]=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23) +'---'+FORMAT( ISNULL(B.FBillAllAmount_LC,0),'0.00')+'Ԫ' ,',') @@ -352,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 @@ -630,7 +638,8 @@ FROM ,[K3ۼרƱ(λ)] ,[K3ۼƱ(λ)] FROM [ZRP_YingShouMingXi_yuyubo] A - WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/+[ӷ])<>[ۼƵ(ԭ)] AND [ܶ]>0 + WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/+[ӷ])<>[ۼƵ] AND [ܶ]>0 + AND (A.ֽʺͬ NOT LIKE 'W%' OR LEN(A.ֽʺͬ)!=8 ) ---2025-08-19 ƼҪ޳W̺źͬӦյ ORDER BY A.[۵ID],[ԱID],[տID]; update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056 @@ -642,3 +651,6 @@ FROM --WHERE [۵ID] IN (SELECT DISTINCT [۵ID] FROM [ZRP_YingShouMingXi_yuyubo] WHERE [ۼƵ]=[ܶ]-[ۼ˻]) END + + +--SELECT LEN('W2025089') \ No newline at end of file diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index b7d226a..56e0b5b 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -469,6 +469,15 @@ ORDER BY a.FVERIFYSEQ; UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=0 WHERE FSALEORGID=100302 AND T_AR_RECEIVEBILL.FBILLNO ='' AND F_AMOUNT !=0 + UPDATE T_AR_RECEIVEBILL SET F_contractnumber=bb.hetong + FROM ( SELECT a.fid + ,hetong=( SELECT STRING_AGG(XiaoShouHeTong, ',') + FROM (SELECT DISTINCT XiaoShouHeTong,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook cc + WHERE ShouKuanBillNo!='' AND FSaleOrgId=100302 AND XiaoShouHeTong IS NOT NULL AND cc.ShouKuanBillNo=a.FBILLNO ) gg) + FROM T_AR_RECEIVEBILL a + WHERE a.FSALEORGID=100302) bb + WHERE FSALEORGID=100302 AND T_AR_RECEIVEBILL.fid=bb.fid AND bb.hetong IS NOT NULL; + --SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT ,FSRCBILLID,a.FMATCHMETHODID --FROM T_AR_RECMacthLog a --LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID