This commit is contained in:
余宇波 2025-08-06 21:45:33 +08:00
parent 4dbe349f48
commit 38a1f3e90b
2 changed files with 96 additions and 10 deletions

View File

@ -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, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS '·¢Æ±×ܽð¶î' FROM (
SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId
,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAXFOR ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FALLAMOUNTFOR
WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAXFOR END AS FAFTERTOTALTAXFOR WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR
--FAFTERTOTALTAX --FAFTERTOTALTAX
FROM T_IV_SALESIC t0 WITH(NOLOCK) FROM
INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID (
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 INNER JOIN dbo.T_SAL_ORDERFIN fin ON aa1.FID=fin.FID
WHERE t0.F_SFQC=0 AND t0.FDOCUMENTSTATUS='C'
) tt ) tt
GROUP BY F_PaperNumber, FSALEORGID GROUP BY F_PaperNumber, FSALEORGID
) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID

View File

@ -115,14 +115,40 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN
,[ShouKuanFDate] ,[ShouKuanFDate]
,[BenCiHeXiao] ,[BenCiHeXiao]
,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) ,[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 ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark
FROM T_SAL_ORDER a FROM T_SAL_ORDER a
LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID 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
(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' LEFT JOIN #temp2 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable'
WHERE a.FSALEORGID=@FSALEORGID 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 DROP TABLE #temp2
---------------------- ----------------------
IF(@hexiao=0) 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 --ON a.XiaoShouFid=b.ID
--ORDER BY a.XiaoShouFid --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 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 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 ON a.XiaoShouFid=b.ID) b
WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid 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 END