diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 60ba6cf..cb860da 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -333,7 +333,17 @@ ORDER BY FDATE END end --------ʷ¼-------------- - IF(@FSALEORGID=100302 or @FSALEORGID=100305) +-- 1 +--100302 麣ŵ +--100303 麣ŵ +--100305 人ŵ +--438223 㶫̼ +--438224 ŵ +--533896 +--1467475 ŵ +--1485290 ɫ +--1542610 ŵ + IF(@FSALEORGID<>100303) begin SELECT @hexiao=1; INSERT INTO [dbo].[ZZZ_HeXiaoBook] @@ -460,21 +470,21 @@ ORDER BY a.FVERIFYSEQ; WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid UPDATE T_SAL_ORDER SET F_AMOUNT=0 - WHERE FSALEORGID in (100302,100305) + WHERE FSALEORGID <> 100303 UPDATE T_SAL_ORDER SET F_AMOUNT=b.BenCiHeXiao 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 in (100302,100305) AND F_AMOUNT <> b.BenCiHeXiao AND T_SAL_ORDER.FBILLNO!='' + WHERE T_SAL_ORDER.FBILLNO=b.XiaoShouBillNo AND FSALEORGID <>100303 AND F_AMOUNT <> b.BenCiHeXiao AND T_SAL_ORDER.FBILLNO!='' UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=0 - WHERE FSALEORGID in (100302,100305) + WHERE FSALEORGID <>100303 UPDATE T_AR_RECEIVEBILL SET F_AMOUNT=b.BenCiHeXiao 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 in (100302,100305) AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' + WHERE T_AR_RECEIVEBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID <>100303 AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' @@ -482,10 +492,10 @@ ORDER BY a.FVERIFYSEQ; FROM ( SELECT a.fid ,hetong=( SELECT STRING_AGG(XiaoShouHeTong, ',') FROM (SELECT DISTINCT XiaoShouHeTong,ShouKuanBillNo FROM dbo.ZZZ_HeXiaoBook cc - WHERE ShouKuanBillNo!='' AND FSaleOrgId in (100302,100305) AND XiaoShouHeTong IS NOT NULL AND cc.ShouKuanBillNo=a.FBILLNO ) gg) + WHERE ShouKuanBillNo!='' AND FSaleOrgId <>100303 AND XiaoShouHeTong IS NOT NULL AND cc.ShouKuanBillNo=a.FBILLNO ) gg) FROM T_AR_RECEIVEBILL a - WHERE a.FSALEORGID in (100302,100305) ) bb - WHERE FSALEORGID in (100302,100305) AND T_AR_RECEIVEBILL.fid=bb.fid AND bb.hetong IS NOT NULL; + WHERE a.FSALEORGID <>100303 ) bb + WHERE FSALEORGID <>100303 AND T_AR_RECEIVEBILL.fid=bb.fid AND bb.hetong IS NOT NULL; PRINT '˿ˮ'; ----------------˿ˮ----------- F_refundAmount F_TuiKuan_Amount @@ -771,19 +781,19 @@ WHERE FBILLFORMID='AR_REFUNDBILL' AND FVERIFYSEQ NOT IN (100135,100138,100042 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 in (100302,100305) AND F_AMOUNT <> b.BenCiHeXiao AND T_AR_RECEIVEBILL.FBILLNO!='' + WHERE T_AR_RECEIVEBILL.FBILLNO=b.XiaoShouBillNo AND FSALEORGID <>100303 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 in (100302,100305) AND T_SAL_ORDER.FBILLNO!=''; + WHERE T_SAL_ORDER.FBILLNO=b.XiaoShouBillNo AND FSALEORGID <>100303 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] IN (3,4) GROUP BY ShouKuanBillNo) b - WHERE T_AR_REFUNDBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID in (100302,100305) ; + WHERE T_AR_REFUNDBILL.FBILLNO=b.ShouKuanBillNo AND FSALEORGID <>100303 ; --SELECT FVERIFYDATE,FBILLFORMID, FVERIFYSEQ,FSOURCETYPE,FCURWRITTENOFFAMOUNTFOR,FCURWRITTENOFFAMOUNT,FSRCBILLNO,b.FEXCHANGERATE,FCURTAXMATCHAMOUNT,FCURNOTAXMATCHAMOUNT ,FSRCBILLID,a.FMATCHMETHODID --FROM T_AR_RECMacthLog a