Merge branch 'master' of http://8.130.121.29:3000/TianHua/Piolot_RepotForm

# Conflicts:
#	.vs/Pilot.Report/v17/.suo
#	.vs/Pilot.Report/v17/DocumentLayout.backup.json
#	.vs/Pilot.Report/v17/DocumentLayout.json
#	Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll
#	Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb

Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs

@@ -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+'小计：',
             '',

Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs

@@ -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);
         }