Compare commits

..

No commits in common. "7e0fd75f21a685f8ab340c5618934531a21ec6b2" and "7208608d60b6e1141125cd507c0fd8659b71444f" have entirely different histories.

4 changed files with 4 additions and 3 deletions

Binary file not shown.

View File

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

View File

@ -14,6 +14,7 @@ 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
{
@ -244,7 +245,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))
{
@ -410,6 +411,7 @@ 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);
}