This commit is contained in:
余宇波 2025-08-13 19:40:29 +08:00
parent 2f388fdbf4
commit bf781bb753
2 changed files with 20 additions and 11 deletions

View File

@ -37,14 +37,14 @@ ORDER BY FDATE
SELECT @fid2=0,@fid3=0; SELECT @fid2=0,@fid3=0;
SELECT @fid2=FID FROM dbo.T_AutoWrireRecordEntry2 WHERE FBILLNO3=@FBILLNO SELECT @fid2=FID FROM dbo.T_AutoWrireRecordEntry2 WHERE FBILLNO3=@FBILLNO
IF(@fid2>0) IF(@fid2>0)
begin BEGIN
SELECT @FDATE=ISNULL(F_YeWuDate,FCREATEDATE),@fid3=FID FROM T_AutoWrireRecord SELECT @FDATE=ISNULL(F_YeWuDate,FCREATEDATE),@fid3=FID FROM T_AutoWrireRecord
WHERE FID=@fid2 AND FDOCUMENTSTATUS='C' WHERE FID=@fid2 AND FDOCUMENTSTATUS='C'
IF(@fid3>0) IF(@fid3>0)
BEGIN BEGIN
SELECT @hexiao=1; SELECT @hexiao=1;
IF((SELECT COUNT(1) FROM T_AutoWrireRecordEntry2 WHERE fid=@fid2)<2) IF((SELECT COUNT(1) FROM T_AutoWrireRecordEntry2 WHERE fid=@fid2)<2)
begin BEGIN
INSERT INTO [dbo].[ZZZ_HeXiaoBook] INSERT INTO [dbo].[ZZZ_HeXiaoBook]
([XiaoShouFid] ([XiaoShouFid]
,[XiaoShouBillNo] ,[XiaoShouBillNo]
@ -140,16 +140,20 @@ 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,FALLAMOUNTFOR_D,@FSALEORGID,'应收核销记录表',@fid3 ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,FCURWRITTENOFFAMOUNTFOR*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 LEFT JOIN
(SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM T_AR_receivable c (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT SUM(FALLAMOUNTFOR) FROM T_AR_RECEIVABLEENTRY akk
where akk.FID=ak.FID)
FALLAMOUNTFOR_D
FROM T_AR_receivable c
LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID
GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID GROUP BY c.FSALEORGID,ak.FORDERNUMBER ,c.FID,ak.FID
) c ) c
ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID ON c.FORDERNUMBER=a.FBILLNO 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
@ -274,7 +278,7 @@ WHERE a.FMATCHMETHODID=30
LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID
WHERE FBILLFORMID='AR_RECEIVEBILL' WHERE FBILLFORMID='AR_RECEIVEBILL'
) )
ORDER BY a.FVERIFYSEQ ORDER BY a.FVERIFYSEQ;
INSERT INTO [dbo].[ZZZ_HeXiaoBook] INSERT INTO [dbo].[ZZZ_HeXiaoBook]
([XiaoShouFid] ([XiaoShouFid]
@ -286,16 +290,18 @@ ORDER BY a.FVERIFYSEQ
,[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,0,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,a.FSALEORGID,'特殊核销没有收款单',FVERIFYSEQ SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,0,d.FSRCBILLNO,FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,a.FSALEORGID,'特殊核销没有收款单',FVERIFYSEQ
,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,1 ,'' ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,1 ,''
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
INNER JOIN INNER JOIN
(SELECT c.FSALEORGID,ak.F_PAPER ,c.FID,SUM(ak.FALLAMOUNTFOR) FALLAMOUNTFOR_D FROM T_AR_receivable c (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT SUM(FALLAMOUNTFOR) FROM T_AR_RECEIVABLEENTRY akk
where akk.FID=ak.FID) FALLAMOUNTFOR_D
FROM T_AR_receivable c
LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID LEFT JOIN T_AR_RECEIVABLEENTRY ak ON c.FID=ak.FID
GROUP BY c.FSALEORGID,ak.F_PAPER ,c.FID GROUP BY c.FSALEORGID,ak.FORDERNUMBER ,c.FID,ak.FID
) c ) c
ON c.F_PAPER=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID ON c.FORDERNUMBER=a.FBILLNO AND c.FSALEORGID=a.FSALEORGID
INNER JOIN #temp222 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable' INNER JOIN #temp222 d ON d.FSRCBILLID=c.fid AND d.FBILLFORMID ='AR_receivable'
WHERE d.FBILLFORMID='AR_receivable' AND a.FDOCUMENTSTATUS='C' WHERE d.FBILLFORMID='AR_receivable' AND a.FDOCUMENTSTATUS='C'
) )

View File

@ -559,6 +559,9 @@ FROM #PLChongDianZhuangHeTong ;
) H7 ) H7
ON B.FENTRYID = H7.FSID AND 1=1 ; ON B.FENTRYID = H7.FSID AND 1=1 ;
UPDATE #tempDaBiao SET TotalSpread=TotalSpread-b.TotalSpreadYiBiao,CurrentSettledUpset2=CurrentSettledUpset2-b.TotalSpreadYiBiao UPDATE #tempDaBiao SET TotalSpread=TotalSpread-b.TotalSpreadYiBiao,CurrentSettledUpset2=CurrentSettledUpset2-b.TotalSpreadYiBiao
FROM (SELECT SUM(a.CurrentSettledUpset1*a.Quantity) AS TotalSpreadYiBiao,a.AFBILLNO FROM #tempDaBiao a FROM (SELECT SUM(a.CurrentSettledUpset1*a.Quantity) AS TotalSpreadYiBiao,a.AFBILLNO FROM #tempDaBiao a
WHERE TableName='#XNChongDianZhuangHeTong' WHERE TableName='#XNChongDianZhuangHeTong'