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

Compare commits

base: Develop:27a39836e558340e9cf262655d2b8c1acccb759b
Branches Tags
Develop:main
..
compare: Develop:66400157198d03f5c9beff3415a36c91e5819995
Branches Tags
Develop:main

2 Commits
27a39836e5 ... 6640015719

Author SHA1 Message Date
liqionghai
6640015719 Merge branch 'main' of http://8.130.121.29:3000/Develop/PiolotTH_ReportFrom 2025-11-03 14:19:29 +08:00
liqionghai
1917d69c4a 1 2025-09-18 10:15:46 +08:00
3 changed files with 18 additions and 12 deletions
Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
SELECT
T1.Fid,T1.XiaoShouFid,T1.ShouKuanFid,T1.ShouKuanBillNo
,CAST(ISNULL(T2.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)AS decimal(10,2)) AS '<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,ROW_NUMBER() OVER(PARTITION BY T1.ShouKuanFid ORDER BY T1.ShouKuanFid,XiaoShouFid) AS '<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,ROW_NUMBER() OVER(PARTITION BY T1.ShouKuanFid ORDER BY T1.ShouKuanFid,ShouKuanFDate,XiaoShouFid) AS '<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,FORMAT(T1.ShouKuanFDate,'yyyy-MM-dd') AS 'ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,CAST('' AS VARCHAR(500)) AS '<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD>ϸ'
,CAST('' AS VARCHAR(500)) AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
@@ -237,7 +237,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
,0 AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,ISNULL(T1.FRECAMOUNT,0)-(ISNULL(T1.F_AMOUNT,0)*ISNULL(T1.FEXCHANGERATE,0)) AS '<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,'' AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,T3.FNAME AS '<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,ISNULL(T3.FNAME,'') AS '<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,0 AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,0 AS 'һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
,0 AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'

9
YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs
View File

@@ -328,15 +328,16 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
//{
// continue;
//}
DateTime dateTime;
string date = string.IsNullOrWhiteSpace(list[i]["DATE"].ToString()) ? "" : Convert.ToDateTime(list[i]["DATE"].ToString().Split(' ')[0]).ToString("yyyy/M/d");
string ShipmentsDate = string.IsNullOrWhiteSpace(list[i]["ShipmentsDate"].ToString()) ? "" : string.Join(",",list[i]["ShipmentsDate"].ToString().Split(' ')[0].Split(',').Select(p=>Convert.ToDateTime(p).ToString("yyyy/M/d")).Distinct().ToList());
//string ShipmentsDate = string.IsNullOrWhiteSpace(list[i]["ShipmentsDate"].ToString()) ? "" : string.Join(",",list[i]["ShipmentsDate"].ToString().Split(' ')[0].Split(',').Select(p=> Convert.ToDateTime(p).ToString("yyyy/M/d")).Distinct().ToList());
string PaymentDate = string.IsNullOrWhiteSpace(list[i]["PaymentDate"].ToString()) ? "" : list[i]["PaymentDate"].ToString().Split(' ')[0];
string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : string.Join(",", list[i]["ZPBillingDate"].ToString().Split(' ')[0].Split(',').Select(p => Convert.ToDateTime(p).ToString("yyyy/M/d")).Distinct().ToList());
//string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : string.Join(",", list[i]["ZPBillingDate"].ToString().Split(' ')[0].Split(',').Select(p => Convert.ToDateTime(p).ToString("yyyy/M/d")).Distinct().ToList());
string ReturnDate = string.IsNullOrWhiteSpace(list[i]["ReturnDate"].ToString()) ? "" : list[i]["ReturnDate"].ToString().Split(' ')[0];
//BillingDate += string.IsNullOrWhiteSpace(list[i]["PPBillingDate"].ToString()) ? "" : (string.IsNullOrWhiteSpace(BillingDate) ?"":",")+list[i]["PPBillingDate"].ToString().Split(' ')[0];
string ShipmentsDate = string.IsNullOrWhiteSpace(list[i]["ShipmentsDate"].ToString()) ? "" : string.Join(",", list[i]["ShipmentsDate"].ToString().Split(' ')[0].Split(',').Select(p => DateTime.TryParse(p,out dateTime) ? Convert.ToDateTime(p).ToString("yyyy/M/d"): p).Distinct().ToList());
string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : string.Join(",", list[i]["ZPBillingDate"].ToString().Split(' ')[0].Split(',').Select(p => DateTime.TryParse(p, out dateTime) ? Convert.ToDateTime(p).ToString("yyyy/M/d") : p).Distinct().ToList());
//将合计行放到最下方
IRow rowi = sheet.CreateRow(j + i);
//if (list[i]["Number"].ToString() == "合计")

17
派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
View File

@@ -227,12 +227,12 @@ WHERE B.
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
GROUP BY FID
UPDATE A
SET --A.ShippedDebt = B.[<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>],-- A.InvoicedDebt = B.[<5B>ѿ<EFBFBD>ƱǷ<C6B1><C7B7>],--A.OwedTickets = B.[ǷƱ],
A.IsEnded = B.[<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN #TEMP4 B ON A.FID = B.FID
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--UPDATE A
--SET --A.ShippedDebt = B.[<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>],-- A.InvoicedDebt = B.[<5B>ѿ<EFBFBD>ƱǷ<C6B1><C7B7>],--A.OwedTickets = B.[ǷƱ],
--A.IsEnded = B.[<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]
--FROM YingShouZhanKuanMX_GZTH A
--INNER JOIN #TEMP4 B ON A.FID = B.FID
--WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0
--<EFBFBD>ѿ<EFBFBD>ƱǷ<EFBFBD><EFBFBD>,<EFBFBD>ѳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>
UPDATE A
@@ -282,6 +282,11 @@ WHERE B.
FROM YingShouZhanKuanMX_GZTH GROUP BY FID) B ON A.FID = B.FID
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 AND A.row_num = 1
UPDATE A
SET A.IsEnded = CASE WHEN A.OwedTickets = 0 AND A.InvoicedDebt = 0 AND A.ShippedDebt = 0 AND A.OrderAmount = A.ShipmentsAmount THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ELSE 'δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END
FROM YingShouZhanKuanMX_GZTH A
WHERE A.[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = 0 AND A.row_num = 1
DROP TABLE #TEMP3
DROP TABLE #TEMP4