Develop/PiolotTH_ReportFrom
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
liqionghai
2025-08-20 15:51:52 +08:00
parent c8cb278e9d
commit 998ec6325f
6 changed files with 163 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HKBaoBiao/回款报表服务器插件.py
View File

@@ -123,18 +123,18 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
if customFiler["F_SDate"] != None and customFiler["F_SDate"].ToString() != "":
if RQLX == "1":
SKRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
HXRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
strFilter += " AND (ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> >= '{0}' OR ISNULL(ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_SDate"].ToString("yyyy-MM-dd")))
if RQLX == "2":
strFilter += " AND (<28><><EFBFBD><EFBFBD> >= '{0}' OR ISNULL(<28><><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_SDate"].ToString("yyyy-MM-dd")))
HXRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
SKRQS = str(customFiler["F_SDate"].ToString("yyyy-MM-dd"))
if customFiler["F_EDate"] != None and customFiler["F_EDate"].ToString() != "":
if RQLX == "1":
strFilter += " AND (ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <= '{0}' OR ISNULL(ҵ<><D2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_EDate"].ToString("yyyy-MM-dd")))
SKRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
HXRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
if RQLX == "2":
strFilter += " AND (<28><><EFBFBD><EFBFBD> <= '{0}' OR ISNULL(<28><><EFBFBD><EFBFBD>,'') = '' OR <20><><EFBFBD><EFBFBD> IN (3,4))".format(str(customFiler["F_EDate"].ToString("yyyy-MM-dd")))
HXRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
SKRQE = str(customFiler["F_EDate"].ToString("yyyy-MM-dd"))
if customFiler["F_contractnumber"] != None and customFiler["F_contractnumber"].ToString() != "":
strFilter += " AND <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '{0}'".format(str(customFiler["F_contractnumber"].ToString()))
if customFiler["F_Currency"] != None and customFiler["F_Currency"].ToString() != "":
@@ -162,7 +162,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
WHERE T1.FID IN (SELECT XiaoShouFid FROM ZZZ_HeXiaoBook)
AND T1.FDOCUMENTSTATUS = 'C'
--AND (T1.FSALEORGID = {4} OR {4} = 0)
--AND (T1.FCUSTID = {5} OR {5} = 0)
AND (T1.FCUSTID = {5} OR {5} = 0)
/*ץȡ<D7A5>տ<D5BF><EEB5A5>Ӧ<EFBFBD><D3A6>Ʊ<EFBFBD><C6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
SELECT T1.FID,FORMAT(T1.FDATE,'yyyy-MM-dd') AS '<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',T1.FRECAMOUNT AS '<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
@@ -274,7 +274,8 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
,T1.Remark AS '<EFBFBD><EFBFBD>ע'
,T1.ZhangLing AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,CAST('' AS VARCHAR(500)) AS '<EFBFBD>ұ<EFBFBD>'
,CASE T1.ShouKuanType WHEN 1 THEN 3 WHEN 2 THEN 4 END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
--,CASE T1.ShouKuanType WHEN 1 THEN 3 WHEN 2 THEN 4 END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,3 '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
FROM ZZZ_HeXiaoBook T1
INNER JOIN #TEMP1 T2 ON T1.XiaoShouFid = T2.FID
WHERE T1.ShouKuanType IN (1,2)