Revert "11"

This reverts commit 99f9c1f80a.
This commit is contained in:
李狗蛋
2025-03-14 20:17:51 +08:00
parent 6e931376e8
commit 58d7a96f65
10 changed files with 49 additions and 51 deletions

View File

@@ -13,7 +13,7 @@ namespace Pilot.Report.Exploitation.Common
public static void Log(string str)
{
return;
//return;
str = DateTime.Now + "----\n" + str;
string now = DateTime.Now.Date.ToString("yyyy-MM-dd");
string currentDirectory = Environment.CurrentDirectory;

View File

@@ -592,7 +592,8 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary
INTO {0}
FROM(SELECT *,1 Sort FROM #TempTable3
UNION ALL
SELECT
SELECT
null,
t1.Area,
t1.Area+'小计:',
'',

View File

@@ -14,7 +14,6 @@ using Pilot.Report.Exploitation.PublicClass;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Spreadsheet;
using NPOI.SS.Formula.Functions;
using Pilot.Report.Exploitation.Common;
namespace Pilot.Report.Exploitation.SaleOrderProgress
{
@@ -245,7 +244,7 @@ namespace Pilot.Report.Exploitation.SaleOrderProgress
Where A.FDOCUMENTSTATUS = 'C' AND W8.FNumber != 'Z' --AND ISNULL(X.FNAME,'') != ''
AND A.FSALEORGID = 100302 AND S.区域 != '碳索智控' AND A.FMANUALCLOSE != '1'
AND ISNULL(K.FNAME,'') NOT IN ('派诺科技(香港)有限公司','武汉派诺科技发展有限公司')
AND X.FNAME != '兴诺总' ", year, year - 1, year - 2, year - 3, year - 4, year - 5, year - 6, tableNameView);
AND X.FNAME != '兴诺总';", year, year - 1, year - 2, year - 3, year - 4, year - 5, year - 6, tableNameView);
if (!string.IsNullOrEmpty(organization))
{
@@ -411,7 +410,6 @@ Where a2.FMANUALROWCLOSE!='1' AND a1.FID = A.FID)*ISNULL(Y2.FSHARERATE,100
FROM #TABLETMEP4) t1
order by Sort;", tableName);
Loghelp.Log(sql);
DBUtils.Execute(this.Context, sql);
}