diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 4c68f78..4cd0eff 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -238,7 +238,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS 'Ʊܽ' FROM ( SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FALLAMOUNTFOR - WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' and FALLAMOUNTFOR >0 THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR + WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' AND FALLAMOUNTFOR >0 THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR --FAFTERTOTALTAX FROM ( diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 56e0b5b..3321d17 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -212,8 +212,8 @@ ORDER BY FDATE LEFT JOIN t_AR_RECEIVEBILL d ON d.FBILLNO=b.FSRCBILLNO 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 - ) + WHERE b.FSRCBILLNO=@FBILLNO AND b.FSOURCETYPE='36cf265bd8c3452194ed9c83ec5e73d2' AND FVERIFYDATE>=@BeginDATE + ) AND FVERIFYSEQ NOT IN (100135) --SELECT * FROM #temp2 --SELECT @amount= SUM(FCURWRITTENOFFAMOUNT) FROM #temp2 WHERE FBILLFORMID !='AR_RECEIVEBILL' SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ FROM #temp2 WHERE FBILLFORMID ='AR_receivable' @@ -299,7 +299,7 @@ ORDER BY FDATE ( SELECT 0,'','',@ShouKuanFID,@FBILLNO,@FDATE,@hexiao,@FSALEORGID,'ֻտ',@fid3 ,d.FEXCHANGERATE,FCURRENCYID,FMAINBOOKCURID,0 ,@remark FROM T_AR_RECEIVEBILL d - WHERE d.FBILLNO=@FBILLNO) + WHERE d.FBILLNO=@FBILLNO ) END end