diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 3321d17..477aeab 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -202,9 +202,9 @@ ORDER BY FDATE -- 5. ͷαԴ DEALLOCATE cursor_name44; -----Ӧպ¼--------- - 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 + 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 INTO #temp2 FROM T_AR_RECMacthLog a LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID @@ -213,7 +213,7 @@ ORDER BY FDATE WHERE FVERIFYSEQ IN (SELECT FVERIFYSEQ FROM T_AR_RECMacthLog a LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLNO AND b.FSOURCETYPE='36cf265bd8c3452194ed9c83ec5e73d2' AND FVERIFYDATE>=@BeginDATE - ) AND FVERIFYSEQ NOT IN (100135) + ) AND FVERIFYSEQ NOT IN (100135,100138,100042) --SELECT * FROM #temp2 --SELECT @amount= SUM(FCURWRITTENOFFAMOUNT) FROM #temp2 WHERE FBILLFORMID !='AR_RECEIVEBILL' SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ FROM #temp2 WHERE FBILLFORMID ='AR_receivable' @@ -402,7 +402,7 @@ WHERE a.FMATCHMETHODID=30 (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' - ) + ) AND FVERIFYSEQ NOT IN (100135,100138,100042) ORDER BY a.FVERIFYSEQ; INSERT INTO [dbo].[ZZZ_HeXiaoBook] @@ -453,21 +453,24 @@ ORDER BY a.FVERIFYSEQ; ON a.XiaoShouFid=b.۵ID) b WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid + UPDATE T_SAL_ORDER SET F_AMOUNT=0 + WHERE FSALEORGID=100302 + UPDATE T_SAL_ORDER SET F_AMOUNT=b.BenCiHeXiao FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,XiaoShouBillNo FROM dbo.ZZZ_HeXiaoBook GROUP BY XiaoShouBillNo) b WHERE T_SAL_ORDER.FBILLNO=b.XiaoShouBillNo AND FSALEORGID=100302 AND F_AMOUNT <> b.BenCiHeXiao AND T_SAL_ORDER.FBILLNO!='' - UPDATE T_SAL_ORDER SET F_AMOUNT=0 - WHERE FSALEORGID=100302 AND T_SAL_ORDER.FBILLNO='' AND F_AMOUNT !=0 + + UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=0 + WHERE FSALEORGID=100302 UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=b.BenCiHeXiao FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook GROUP BY ShouKuanBillNo) b WHERE T_AR_RECEIVEBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID=100302 AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' - UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=0 - WHERE FSALEORGID=100302 AND T_AR_RECEIVEBILL.FBILLNO ='' AND F_AMOUNT !=0 + UPDATE T_AR_RECEIVEBILL SET F_contractnumber=bb.hetong FROM ( SELECT a.fid