From 38a1f3e90bed89064330682bafb3e6036e4fe41d Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Wed, 6 Aug 2025 21:45:33 +0800 Subject: [PATCH] 11 --- 非C#代码文件/应收明细SQL.sql | 17 +++-- 非C#代码文件/收款单核销流水存储过程.sql | 89 +++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 38ba1af..d449af0 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -236,13 +236,20 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE ( SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS 'Ʊܽ' FROM ( SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId - ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAXFOR - WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAXFOR END AS FAFTERTOTALTAXFOR + ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FALLAMOUNTFOR + WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR --FAFTERTOTALTAX -FROM T_IV_SALESIC t0 WITH(NOLOCK) -INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID +FROM +( +SELECT t1.f_contractno AS F_PAPERNUMBER, t0.FSALEORGID,t0.FCURRENCYID,F_GENERALINVOICE +,SUM(t1.FALLAMOUNTFOR) AS FALLAMOUNTFOR + FROM T_IV_SALESIC t0 WITH(NOLOCK) +LEFT JOIN T_IV_SALESICENTRY t1 WITH(NOLOCK) ON t0.FID=t1.FID +WHERE t0.F_SFQC=0 AND t0.FDOCUMENTSTATUS='C' + GROUP BY t1.f_contractno, t0.FSALEORGID,t0.FCURRENCYID,F_GENERALINVOICE +) t0 +INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSALEORGID=aa1.FSALEORGID INNER JOIN dbo.T_SAL_ORDERFIN fin ON aa1.FID=fin.FID -WHERE t0.F_SFQC=0 AND t0.FDOCUMENTSTATUS='C' ) tt GROUP BY F_PaperNumber, FSALEORGID ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 102ca2f..f293578 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -115,14 +115,40 @@ 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,d.FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧպ¼',@fid3 + ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,FALLAMOUNTFOR_D,@FSALEORGID,'Ӧպ¼',@fid3 ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_SAL_ORDER a - LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID - LEFT JOIN T_AR_receivable c ON c.F_PAPERPRO=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID + LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID + LEFT JOIN + (SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM T_AR_receivable c + LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID + GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID + ) c + ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID LEFT JOIN #temp2 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable' WHERE a.FSALEORGID=@FSALEORGID AND d.FBILLFORMID='AR_receivable') - end + END + ELSE + BEGIN + SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ,@hexiao=FCURWRITTENOFFAMOUNTFOR FROM #temp2 WHERE FSRCBILLNO=@FBILLNO AND FBILLFORMID='AR_RECEIVEBILL' + IF(@fid2>0) + BEGIN + INSERT INTO [dbo].[ZZZ_HeXiaoBook] + ([XiaoShouFid] + ,[XiaoShouBillNo] + ,[XiaoShouHeTong] + ,[ShouKuanFid] + ,[ShouKuanBillNo] + ,[ShouKuanFDate] + ,[BenCiHeXiao] + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) + ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,@FDATE,@hexiao,@FSALEORGID,'ֻտ',@fid3 + ,d.FEXCHANGERATE,FCURRENCYID,FMAINBOOKCURID,0 ,@remark + FROM T_AR_RECEIVEBILL d + WHERE d.FBILLNO=@FBILLNO) + END + end + DROP TABLE #temp2 --------------տԴϸ-------- IF(@hexiao=0) @@ -190,11 +216,64 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN --ON a.XiaoShouFid=b.۵ID --ORDER BY a.XiaoShouFid - UPDATE [ZZZ_HeXiaoBook] SET ZhangLing= ISNULL( ROUND( DATEDIFF(DAY,[ʱ],[ZZZ_HeXiaoBook].ShouKuanFDate) / 30.00,0) ,0 ) + UPDATE [ZZZ_HeXiaoBook] SET ZhangLing= ISNULL( ROUND( DATEDIFF(DAY,[ʱ],[ZZZ_HeXiaoBook].ShouKuanFDate) / 30,0) ,0 ) FROM (SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.ԤƵʱ,b.ʱ FROM [ZZZ_HeXiaoBook] a LEFT JOIN (SELECT b.۵ID,MAX(b.ԤƵʱ) AS ԤƵʱ ,max (b.ʱ) AS ʱ FROM [ZRP_YingShouMingXi_yuyubo] b GROUP BY ۵ID) b ON a.XiaoShouFid=b.۵ID) b WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid +------------------ + +SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT ,FSRCBILLID,a.FMATCHMETHODID +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 + (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' + ) +ORDER BY a.FVERIFYSEQ + + + INSERT INTO [dbo].[ZZZ_HeXiaoBook] + ([XiaoShouFid] + ,[XiaoShouBillNo] + ,[XiaoShouHeTong] + ,[ShouKuanFid] + ,[ShouKuanBillNo] + ,[ShouKuanFDate] + ,[BenCiHeXiao] + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) + ( + SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,d.FVERIFYSEQ,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,a.FSALEORGID,'ûտ',FVERIFYSEQ + ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,'' + FROM T_SAL_ORDER a + LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID + INNER JOIN + (SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM T_AR_receivable c + LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID + GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID + ) c + ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID + INNER JOIN #temp222 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable' + WHERE d.FBILLFORMID='AR_receivable' AND a.FDOCUMENTSTATUS='C' + --AND d.FVERIFYSEQ=109376 + ORDER BY d.FVERIFYSEQ + + ) + + --SELECT * FROM #temp222 + --WHERE FVERIFYSEQ=109376 + +DROP TABLE #temp222 +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 +LEFT JOIN T_BAS_BILLTYPE c ON b.FSOURCETYPE=c.FBILLTYPEID +WHERE a.FVERIFYSEQ =100135 + END