diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 4ad1721..595dddd 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -204,7 +204,7 @@ ORDER BY FDATE -----Ӧպ¼--------- SELECT @fid2=0,@fid3=0,@F_contractnumber='',@amount=0; SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT - ,FSRCBILLID ,b.FCURRENCYID,b.FLOCALCURRID + ,FSRCBILLID ,b.FCURRENCYID,b.FLOCALCURRID,b.FORDERBILLNO INTO #temp2 FROM T_AR_RECMacthLog a LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID @@ -393,6 +393,7 @@ ORDER BY FDATE ------------------ SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT ,FSRCBILLID,a.FMATCHMETHODID +,b.FORDERBILLNO INTO #temp222 FROM T_AR_RECMacthLog a LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID @@ -422,14 +423,14 @@ ORDER BY a.FVERIFYSEQ; FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID INNER JOIN - (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT SUM(FALLAMOUNTFOR) FROM T_AR_RECEIVABLEENTRY akk + (SELECT c.FSALEORGID,ak.FORDERNUMBER ,c.FID,SUM(ak.FALLAMOUNTFOR)/(SELECT CASE WHEN SUM(FALLAMOUNTFOR)=0 THEN 100000000 ELSE SUM(FALLAMOUNTFOR) end 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 GROUP BY c.FSALEORGID,ak.FORDERNUMBER ,c.FID,ak.FID ) c 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') OR (a.FBILLNO=d.FORDERBILLNO AND a.FBILLNO <> '' ) WHERE d.FBILLFORMID='AR_receivable' AND a.FDOCUMENTSTATUS='C' ) DROP TABLE #temp222