diff --git a/.vs/Pilot.Report/v17/.suo b/.vs/Pilot.Report/v17/.suo index 6838f6f..d7f363b 100644 Binary files a/.vs/Pilot.Report/v17/.suo and b/.vs/Pilot.Report/v17/.suo differ diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json index 2b8e2c2..4095c6b 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json @@ -6,14 +6,14 @@ "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\saleorderprogress\\phbsaleorderreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\saleorderprogress\\phbsaleorderreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\pilot.report.exploitation\\resultskanbansummary\\resultsreportserviceplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultsreportserviceplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -26,21 +26,8 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 0, "Children": [ - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "PHBSaleOrderReport.cs", - "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "ViewState": "AgIAAJ0BAAAAAAAAAAAqwMMBAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:58:47.06Z", - "EditorCaption": "" - }, { "$type": "Document", "DocumentIndex": 0, @@ -49,24 +36,36 @@ "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\Common\\Loghelp.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAowBYAAAAoAAAAAAAAAA==", + "ViewState": "AgIAAAYAAAAAAAAAAAAowCsAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:47:51.103Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "ResultsKanbanSumReport.cs", "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "ViewState": "AgIAAEsCAAAAAAAAAAAQwFkCAAAjAAAAAAAAAA==", + "ViewState": "AgIAAC4CAAAAAAAAAAAswCUAAAAPAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:26:46.159Z", "EditorCaption": "" }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "ResultsReportServicePlugIn.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "ViewState": "AgIAAA4AAAAAAAAAAAAwwA0AAAAaAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-14T11:26:42.744Z" + }, { "$type": "Document", "DocumentIndex": 3, diff --git a/.vs/Pilot.Report/v17/DocumentLayout.json b/.vs/Pilot.Report/v17/DocumentLayout.json index 2b8e2c2..09327b6 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.json @@ -2,18 +2,18 @@ "Version": 1, "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\", "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\saleorderprogress\\phbsaleorderreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\saleorderprogress\\phbsaleorderreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\pilot.report.exploitation\\resultskanbansummary\\resultsreportserviceplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultsreportserviceplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -30,43 +30,43 @@ "Children": [ { "$type": "Document", - "DocumentIndex": 1, - "Title": "PHBSaleOrderReport.cs", - "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\SaleOrderProgress\\PHBSaleOrderReport.cs", - "ViewState": "AgIAAJ0BAAAAAAAAAAAqwMMBAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:58:47.06Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "Loghelp.cs", "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\Common\\Loghelp.cs", "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\Common\\Loghelp.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAowBYAAAAoAAAAAAAAAA==", + "ViewState": "AgIAAAYAAAAAAAAAAAAowB0AAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:47:51.103Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, "Title": "ResultsKanbanSumReport.cs", "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "ViewState": "AgIAAEsCAAAAAAAAAAAQwFkCAAAjAAAAAAAAAA==", + "ViewState": "AgIAABYCAAAAAAAAAAAQwGkCAAA1AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:26:46.159Z", "EditorCaption": "" }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ResultsReportServicePlugIn.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsReportServicePlugIn.cs", + "ViewState": "AgIAAA8AAAAAAAAAAAAAACMAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-14T11:26:42.744Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 3, diff --git a/Pilot.Report.Exploitation/Common/Loghelp.cs b/Pilot.Report.Exploitation/Common/Loghelp.cs index 925729e..f733eca 100644 --- a/Pilot.Report.Exploitation/Common/Loghelp.cs +++ b/Pilot.Report.Exploitation/Common/Loghelp.cs @@ -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; diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs index fc566dc..7070dea 100644 --- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs +++ b/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+'小计:', '', diff --git a/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs b/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs index 25a1ab5..4a83276 100644 --- a/Pilot.Report.Exploitation/SaleOrderProgress/PHBSaleOrderReport.cs +++ b/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); } diff --git a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll index 9ac5cf8..9f1a575 100644 Binary files a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll and b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll differ diff --git a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb index bea820c..eec7fb6 100644 Binary files a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb and b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb differ diff --git a/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.dll b/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.dll index 9ac5cf8..9f1a575 100644 Binary files a/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.dll and b/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.dll differ diff --git a/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.pdb b/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.pdb index bea820c..eec7fb6 100644 Binary files a/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.pdb and b/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.pdb differ