diff --git a/.vs/Pilot.Report/v17/.suo b/.vs/Pilot.Report/v17/.suo index 6838f6f..7894806 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..ebcc73e 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json @@ -3,16 +3,16 @@ "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\\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\\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\\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}", @@ -26,7 +26,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 2, "Children": [ { "$type": "Document", @@ -36,14 +36,14 @@ "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==", + "ViewState": "AgIAAKABAAAAAAAAAAAqwMMBAAAAAAAAAAAAAA==", "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", @@ -56,13 +56,13 @@ }, { "$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": "AgIAAJ8CAAAAAAAAAAAUwL4CAAAsAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:26:46.159Z", "EditorCaption": "" diff --git a/.vs/Pilot.Report/v17/DocumentLayout.json b/.vs/Pilot.Report/v17/DocumentLayout.json index 2b8e2c2..ebcc73e 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.json @@ -3,16 +3,16 @@ "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\\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\\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\\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}", @@ -26,7 +26,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 2, "Children": [ { "$type": "Document", @@ -36,14 +36,14 @@ "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==", + "ViewState": "AgIAAKABAAAAAAAAAAAqwMMBAAAAAAAAAAAAAA==", "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", @@ -56,13 +56,13 @@ }, { "$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": "AgIAAJ8CAAAAAAAAAAAUwL4CAAAsAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:26:46.159Z", "EditorCaption": "" diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs index fc566dc..c673d68 100644 --- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs +++ b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs @@ -687,16 +687,16 @@ namespace Pilot.Report.Exploitation.ResultsKanbanSummary null, '合计:', null, - SUM(FPERFORMANCETARGETS), - SUM(Pilot2024), - SUM(SiNO2024), - SUM(WuHanPilot2024), - SUM(Discovery2024), - SUM(HongKongPilot2024), - SUM(HuaXiaYunLian2024), + SUM(FPERFORMANCETARGETS), + SUM([2024Pilot]), + SUM([2024SiNO]), + SUM([2024WuHanPilot]), + SUM([2024Discovery]), + SUM([2024HongKongPilot]), + SUM([2024HuaXiaYunLian]), SUM(UsualAlterAmount), - SUM(SumAmount2024), - SUM(SumAmount2023), + SUM([2024SumAmount]), + SUM([2023SumAmount]), SUM(FPAYMENTSUM), SUM(Payment), SUM(ShippedReceivables), diff --git a/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.dll index 9ac5cf8..e41663e 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..3a85344 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..e41663e 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..3a85344 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