From 306d904865a06029526014dfde0507a1bf882352 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Fri, 15 Aug 2025 19:44:31 +0800 Subject: [PATCH] 11 --- 非C#代码文件/应收明细SQL.sql | 11 +++++++---- 非C#代码文件/收款单核销流水存储过程.sql | 15 ++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 8ef6c3e..6bc1eed 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,ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime)) + WHEN X.FNAME LIKE '%տ%' THEN DATEADD(DAY, plan1.F_DAY,ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck.FDATE)) WHEN X.FNAME LIKE '%Ʊտ%' THEN DATEADD(DAY, plan1.F_DAY,FP.FAPPROVEDATE) - 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, ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck.FDATE)) 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,MAX(F_SigningTime) F_SigningTime + LEFT JOIN (SELECT MAX(F_SFSIGNATURETIME) F_SFSIGNATURETIME ,F_CONTRACTNUMBER,FSALEORGID,MAX(F_SigningTime) F_SigningTime,MAX(FDATE) AS FDATE FROM T_SAL_OUTSTOCK WITH(NOLOCK) WHERE F_CONTRACTNUMBER = a.F_CONTRACTNUMBER AND FSALEORGID = a.FSALEORGID GROUP BY F_CONTRACTNUMBER,FSALEORGID @@ -441,6 +441,9 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET ([ܶ]-[ۼ˻]-[K3ۼ˻(λ)]/ )*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01 +[ӷ] -ISNULL([ڽ],0) ,[Ƿת]=CASE WHEN [] > 12 THEN '' ELSE '' END ; + update [ZRP_YingShouMingXi_yuyubo] SET [ԤƵʱ]=NULL,[δڽ]=0 + WHERE [δڽ]<0; + --, fin.FExchangeRate [] -- , (0) [ͻö] @@ -619,7 +622,7 @@ FROM ,[K3ۼרƱ(λ)] ,[K3ۼƱ(λ)] FROM [ZRP_YingShouMingXi_yuyubo] A - WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/+[ӷ])<>[ۼƵ(ԭ)] + WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/+[ӷ])<>[ۼƵ(ԭ)] AND [ܶ]>0 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 diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index e5569fa..5f9ba3a 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -44,6 +44,7 @@ ORDER BY FDATE INTO @fid2 WHILE @@FETCH_STATUS = 0 BEGIN + SELECT @fid3=0; IF (@fid2 > 0) BEGIN SELECT @FDATE = ISNULL(F_YEWUDATE, FCREATEDATE), @@ -186,7 +187,7 @@ ORDER BY FDATE END -----Ӧպ¼--------- SELECT @fid2=0,@fid3=0,@F_contractnumber='',@amount=0; - SELECT d.FDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT + SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT ,FSRCBILLID ,b.FCURRENCYID,b.FLOCALCURRID INTO #temp2 FROM T_AR_RECMacthLog a @@ -203,7 +204,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN IF(@fid2>0) BEGIN SELECT @hexiao=1; - + SELECT @FDATE=FVERIFYDATE FROM #temp2; IF((SELECT COUNT(1) FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID @@ -228,7 +229,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanFDate] ,[BenCiHeXiao] ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) - ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧպ¼',@fid3 + ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧպ¼',@fid3 ,dd.FEXCHANGERATE,dd.FSettleCurrId,dd.FLOCALCURRID,0 ,@remark FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID @@ -256,7 +257,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanFDate] ,[BenCiHeXiao] ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) - ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,@FDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧպ¼ڳӦյ',@fid3 + ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧպ¼ڳӦյ',@fid3 ,FEXCHANGERATE,FCURRENCYID,FLOCALCURRID,0 ,@remark FROM #temp2 d WHERE d.FBILLFORMID='AR_RECEIVEBILL' ) @@ -266,7 +267,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN END ELSE BEGIN - SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ,@hexiao=FCURWRITTENOFFAMOUNTFOR FROM #temp2 WHERE FSRCBILLNO=@FBILLNO AND FBILLFORMID='AR_RECEIVEBILL' + SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ,@hexiao=FCURWRITTENOFFAMOUNTFOR,@FDATE=FVERIFYDATE FROM #temp2 WHERE FSRCBILLNO=@FBILLNO AND FBILLFORMID='AR_RECEIVEBILL' IF(@fid2>0) BEGIN INSERT INTO [dbo].[ZZZ_HeXiaoBook] @@ -303,7 +304,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanFDate] ,[BenCiHeXiao] ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) - ( SELECT aa.fid,aa.FBILLNO,aa.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,b.FREALRECAMOUNT,@FSALEORGID,'տԴϸ',@fid2 + ( SELECT aa.fid,aa.FBILLNO,aa.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,a.FDATE,b.FREALRECAMOUNT,@FSALEORGID,'տԴϸ',@fid2 ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_AR_RECEIVEBILL a LEFT JOIN T_AR_RECEIVEBILLSRCENTRY b ON a.FID=b.FID LEFT JOIN dbo.T_SAL_ORDER aa ON b.FSRCBILLID=aa.FID @@ -324,7 +325,7 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanFDate] ,[BenCiHeXiao] ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) - ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'ʷ¼',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark + ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,c.F_Date,F_shareAmount,@FSALEORGID,'ʷ¼',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_SAL_ORDER a RIGHT JOIN VRYF_t_Cust_Entry100021 c ON a.F_CONTRACTNUMBER=c.F_ORDERNO LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID