From d1310fa33b9cd1e35474b87509c674ac100f2812 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 13 Oct 2025 15:25:37 +0800 Subject: [PATCH] 2 --- 非C#代码文件/收款单核销流水存储过程.sql | 37 +++++++++++++++++-------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 6ff9953..12407de 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -463,7 +463,7 @@ ORDER BY a.FVERIFYSEQ; WHERE FSALEORGID=100302 UPDATE T_SAL_ORDER SET F_AMOUNT=b.BenCiHeXiao - FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,XiaoShouBillNo FROM dbo.ZZZ_HeXiaoBook + FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,XiaoShouBillNo FROM dbo.ZZZ_HeXiaoBook WHERE [ShouKuanType]!=3 GROUP BY XiaoShouBillNo) b WHERE T_SAL_ORDER.FBILLNO=b.XiaoShouBillNo AND FSALEORGID=100302 AND F_AMOUNT <> b.BenCiHeXiao AND T_SAL_ORDER.FBILLNO!='' @@ -472,7 +472,7 @@ ORDER BY a.FVERIFYSEQ; WHERE FSALEORGID=100302 UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=b.BenCiHeXiao - FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook + FROM (SELECT SUM(BenCiHeXiao ) BenCiHeXiao,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook WHERE [ShouKuanType]!=3 GROUP BY ShouKuanBillNo) b WHERE T_AR_RECEIVEBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID=100302 AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' @@ -522,7 +522,7 @@ BEGIN DECLARE cursor_TuiKuanRecord1 CURSOR FOR SELECT FTYPE, - FCONTRACTNUMBER, + FBILLNO2, FALLAMOUNT22 FROM dbo.T_RefundWrireRecordEntry WHERE FID = @ShouKuanFID; @@ -572,7 +572,7 @@ BEGIN @FDATE, @hexiao, a.FSALEORGID, - '˿¼V1', + '˿¼1V', @ShouKuanFID, dd.FEXCHANGERATE, FSETTLECURRID, @@ -612,7 +612,7 @@ BEGIN @FDATE, c.FALLAMOUNT33, a.FSALEORGID, - '˿¼1V', + '˿¼V1', @ShouKuanFID, dd.FEXCHANGERATE, FSETTLECURRID, @@ -621,7 +621,7 @@ BEGIN head.F_NOTE FROM T_SAL_ORDER a LEFT JOIN T_RefundWrireRecordEntry b - ON a.FBILLNO = b.FCONTRACTNUMBER + ON a.FBILLNO = b.FBILLNO2 LEFT JOIN T_RefundWrireRecordEntry2 c ON b.FID = c.FID LEFT JOIN T_SAL_ORDERFIN dd @@ -668,12 +668,12 @@ BEGIN @FDATE, @hexiao, a.FSALEORGID, - 'տ˿¼V1', + 'տ˿¼1V', @ShouKuanFID, a.FEXCHANGERATE, FCURRENCYID, FMAINBOOKCURID, - 3, + 4, @remark FROM T_AR_RECEIVEBILL a WHERE a.FBILLNO = @FBILLNO); @@ -706,7 +706,7 @@ BEGIN @FDATE, c.FALLAMOUNT33, a.FSALEORGID, - 'տ˿¼1V', + 'տ˿¼V1', @ShouKuanFID, a.FEXCHANGERATE, a.FCURRENCYID, @@ -715,7 +715,7 @@ BEGIN head.F_NOTE FROM T_AR_RECEIVEBILL a LEFT JOIN T_RefundWrireRecordEntry b - ON a.FBILLNO = b.FCONTRACTNUMBER + ON a.FBILLNO = b.FBILLNO2 LEFT JOIN T_RefundWrireRecordEntry2 c ON b.FID = c.FID LEFT JOIN T_RefundWrireRecord head @@ -748,9 +748,24 @@ CLOSE TuiKuanRecord; -- 5. ͷαԴ DEALLOCATE TuiKuanRecord; + -----տѺ= ۵-˿ + UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=F_AMOUNT+ISNULL(b.BenCiHeXiao,0),F_TUIKUAN_AMOUNT=ISNULL(b.BenCiHeXiao,0) + FROM (SELECT SUM(BenCiHeXiao*-1 ) BenCiHeXiao,XiaoShouBillNo FROM dbo.ZZZ_HeXiaoBook WHERE [ShouKuanType]=4 + GROUP BY XiaoShouBillNo) b + WHERE T_AR_RECEIVEBILL.FBILLNO=b.XiaoShouBillNo AND FSALEORGID=100302 AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' + ----۵Ѻ=տ+˿ + UPDATE T_SAL_ORDER SET F_AMOUNT=F_AMOUNT+ISNULL(b.BenCiHeXiao,0),F_refundAmount=ISNULL(b.BenCiHeXiao,0) + FROM (SELECT SUM(BenCiHeXiao*1 ) BenCiHeXiao,XiaoShouBillNo FROM dbo.ZZZ_HeXiaoBook WHERE [ShouKuanType]=3 + GROUP BY XiaoShouBillNo) b + WHERE T_SAL_ORDER.FBILLNO=b.XiaoShouBillNo AND FSALEORGID=100302 AND T_SAL_ORDER.FBILLNO!=''; - + ---˿=˿ + UPDATE T_AR_REFUNDBILL SET F_AMOUNT=ISNULL(b.BenCiHeXiao,0) + FROM (SELECT SUM(BenCiHeXiao *(-1)) BenCiHeXiao,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook WHERE [ShouKuanType]=3 + GROUP BY ShouKuanBillNo) b + WHERE T_AR_REFUNDBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID=100302 AND T_AR_REFUNDBILL.FBILLNO!=''; + --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