diff --git a/.vs/Pilot.Report/v17/.suo b/.vs/Pilot.Report/v17/.suo deleted file mode 100644 index d7f363b..0000000 Binary files a/.vs/Pilot.Report/v17/.suo and /dev/null differ diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json index 4095c6b..36e8a70 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json @@ -1,22 +1,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\\", + "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\", "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}", + "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_git\\pilot.report.exploitation\\receivables\\receivablesdetails.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\\receivables\\receivablesdetails.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_Git\\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}", + "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_Git\\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}" } ], "DocumentGroupContainers": [ @@ -31,52 +27,41 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "ReceivablesDetails.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "ViewState": "AgIAAFsAAAAAAAAAAAAIwGwAAACpAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-15T12:19:32.438Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, "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", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\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", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Common\\Loghelp.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", - "ViewState": "AgIAAAYAAAAAAAAAAAAowCsAAAABAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAAJAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-03-14T11:47:51.103Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "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", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\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", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "ViewState": "AgIAAC4CAAAAAAAAAAAswCUAAAAPAAAAAAAAAA==", + "ViewState": "AgIAAGgAAAAAAAAAAAAAwNACAAABAAAAAAAAAA==", "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, - "Title": "AnnualSalesPaymentSumReport.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\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.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\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "ViewState": "AgIAAF8AAAAAAAAAAAAQwHkAAAAWAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:25:52.658Z" } ] } diff --git a/.vs/Pilot.Report/v17/DocumentLayout.json b/.vs/Pilot.Report/v17/DocumentLayout.json deleted file mode 100644 index 09327b6..0000000 --- a/.vs/Pilot.Report/v17/DocumentLayout.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "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\\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}" - } - ], - "DocumentGroupContainers": [ - { - "Orientation": 0, - "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "DockedWidth": 200, - "SelectedChildIndex": 1, - "Children": [ - { - "$type": "Document", - "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": "AgIAAAYAAAAAAAAAAAAowB0AAAARAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:47:51.103Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "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": "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, - "Title": "AnnualSalesPaymentSumReport.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\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.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\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", - "ViewState": "AgIAAF8AAAAAAAAAAAAQwHkAAAAWAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:25:52.658Z" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index 1c7d89d..bf3f37f 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -3,17 +3,14 @@ using Kingdee.BOS.Core.CommonFilter; using Kingdee.BOS.Core.DynamicForm; using Kingdee.BOS.Core.DynamicForm.PlugIn; using Kingdee.BOS.Core.DynamicForm.PlugIn.Args; -using Kingdee.BOS.Core.Permission; -using Kingdee.BOS.Core.SqlBuilder; using Kingdee.BOS.Orm.DataEntity; using Kingdee.BOS.Util; -using SixLabors.ImageSharp.PixelFormats; +using Kingdee.K3.FIN.Core; +using Pilot.Report.Exploitation.Common; using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Pilot.Report.Exploitation.Receivables @@ -28,7 +25,7 @@ namespace Pilot.Report.Exploitation.Receivables { base.OnLoad(e); var showParameter = new DynamicFormShowParameter(); - showParameter.FormId = "YKQC_YSKMXBGL"; + showParameter.FormId = "VRYF_YSKMXBGL"; showParameter.ParentPageId = this.View.PageId; showParameter.PageId = this.View.PageId + "_Filter"; showParameter.OpenStyle.CacheId = this.View.PageId; @@ -42,12 +39,19 @@ namespace Pilot.Report.Exploitation.Receivables if (e.BarItemKey.Equals("MBBA_tbButton_GL", StringComparison.OrdinalIgnoreCase)) { var showParameter = new DynamicFormShowParameter(); - showParameter.FormId = "YKQC_YSKMXBGL"; + showParameter.FormId = "VRYF_YSKMXBGL"; showParameter.ParentPageId = this.View.PageId; showParameter.PageId = this.View.PageId + "_Filter"; showParameter.OpenStyle.CacheId = this.View.PageId; this.View.ShowForm(showParameter,action => FilterCallBack(action)); } + //点击刷新数据按钮 + if (e.BarItemKey == "MBBA_tbButton") + { + var sql_1 = string.Format(@"/*dialect*/exec PR_YingShouMingXi_yuyubo "); + DBUtils.ExecuteDynamicObject(Context, sql_1); + + } //点击保存按钮 if (e.BarItemKey == "MBBA_tbButton_2") @@ -58,104 +62,148 @@ namespace Pilot.Report.Exploitation.Receivables //判断是否存在表 if (sql_List1.Count() > 0) { - DynamicObjectCollection entries = this.View.Model.DataObject[6] as DynamicObjectCollection; + + /* + * + * + * // 1. 确认分录字段的Key(如 "FEntity") +string entryKey = "FEntity"; + +// 2. 安全获取DynamicObjectCollection +if (this.View.Model.DataObject != null && + this.View.Model.DataObject.ContainsKey(entryKey)) +{ + DynamicObjectCollection entries = this.View.Model.DataObject[entryKey] as DynamicObjectCollection; + + if (entries != null) + { + // 遍历分录行 + foreach (DynamicObject entryRow in entries) + { + // 获取字段值(例如物料ID) + object materialId = entryRow["FMaterialId"]; + // 其他字段处理... + } + } + else + { + this.View.ShowMessage("分录数据格式错误!"); + } +} +else +{ + this.View.ShowMessage("未找到分录字段或DataObject为空!"); +} + * + */ + DynamicObjectCollection entries = this.View.Model.DataObject["MBBA_K99bd8a69"] as DynamicObjectCollection; + var list = entries.Where(g => g.GetValue("F_666") == "True").ToList(); List strings = new List(); - foreach (var item in entries) + string upsql = ""; + int i = 0; + foreach (var item in list) { - if (item["F_666"]?.ToString() == "True") + if (item["F_FID"].ToString() != "0" && item["F_FID"] != null) { - strings.Add(Convert.ToInt32(item["F_FID"])); + upsql += $@"update ReceivablesDetailsTable set F_061='{item["F_061"]}', F_054='{item["F_054"]}' ,F_055='{item["F_055"]}',F_056='{item["F_056"]}' + ,F_060='{item["F_060"]}',F_057='{item["F_057"]}',F_058='{item["F_058"]}',[EditTime]='{DateTime.Now}',[IfManualEdit]=1 where FID={item["F_FID"]};"; + } + i++; + if (i >= 100) + { + + Loghelp.Log("MBBA_tbButton_2"+upsql); + DBUtils.ExecuteDynamicObject(Context, upsql); + upsql = ""; + i = 0; } } - string fids = string.Join(",", strings.ToArray()); - string sql_2 = string.Format(@"DELETE FROM ReceivablesDetailsTable Where Fid in ({0})", fids); - DBUtils.ExecuteDynamicObject(Context, sql_2); - for (int i = 0; i < entries.Count; i++) + if (upsql != "") { - var f = this.View.Model.GetValue("F_000", i)?.ToString(); - if (f != "0" && entries[i]["F_666"]?.ToString() == "True") - { - #region 隐藏单据体赋值 - - var f0 = this.View.Model.GetValue("F_000", i); - var f1 = this.View.Model.GetValue("F_001", i); - var f2 = this.View.Model.GetValue("F_002", i); - var f3 = this.View.Model.GetValue("F_003", i); - var f4 = this.View.Model.GetValue("F_004", i); - var f5 = this.View.Model.GetValue("F_005", i); - var f6 = this.View.Model.GetValue("F_006", i); - var f7 = this.View.Model.GetValue("F_007", i); - var f8 = this.View.Model.GetValue("F_008", i); - var f9 = this.View.Model.GetValue("F_009", i); - var f10 = this.View.Model.GetValue("F_010", i); - var f11 = this.View.Model.GetValue("F_011", i); - var f12 = this.View.Model.GetValue("F_012", i); - var f13 = this.View.Model.GetValue("F_013", i); - var f14 = this.View.Model.GetValue("F_014", i); - var f15 = this.View.Model.GetValue("F_015", i); - var f16 = this.View.Model.GetValue("F_016", i); - var f17 = this.View.Model.GetValue("F_017", i); - var f18 = this.View.Model.GetValue("F_018", i); - var f19 = this.View.Model.GetValue("F_019", i); - var f20 = this.View.Model.GetValue("F_020", i); - var f21 = this.View.Model.GetValue("F_021", i); - var f22 = this.View.Model.GetValue("F_022", i); - var f23 = this.View.Model.GetValue("F_023", i); - var f24 = this.View.Model.GetValue("F_024", i); - var f25 = this.View.Model.GetValue("F_025", i); - var f26 = this.View.Model.GetValue("F_026", i); - var f27 = this.View.Model.GetValue("F_027", i); - var f28 = this.View.Model.GetValue("F_028", i); - var f29 = this.View.Model.GetValue("F_029", i); - var f30 = this.View.Model.GetValue("F_030", i); - var f31 = this.View.Model.GetValue("F_031", i); - var f32 = this.View.Model.GetValue("F_032", i); - var f33 = this.View.Model.GetValue("F_033", i); - var f34 = this.View.Model.GetValue("F_034", i); - var f35 = this.View.Model.GetValue("F_035", i); - var f36 = this.View.Model.GetValue("F_036", i); - var f37 = this.View.Model.GetValue("F_037", i); - var f38 = this.View.Model.GetValue("F_038", i); - var f39 = this.View.Model.GetValue("F_039", i); - var f40 = this.View.Model.GetValue("F_040", i); - var f41 = this.View.Model.GetValue("F_041", i); - var f42 = this.View.Model.GetValue("F_042", i); - var f43 = this.View.Model.GetValue("F_043", i); - var f44 = this.View.Model.GetValue("F_044", i); - var f45 = this.View.Model.GetValue("F_045", i); - var f46 = this.View.Model.GetValue("F_046", i); - var f47 = this.View.Model.GetValue("F_047", i); - var f48 = this.View.Model.GetValue("F_048", i); - var f49 = this.View.Model.GetValue("F_049", i); - var f50 = this.View.Model.GetValue("F_050", i); - var f51 = this.View.Model.GetValue("F_051", i); - var f52 = this.View.Model.GetValue("F_052", i); - var f53 = this.View.Model.GetValue("F_053", i); - var f54 = this.View.Model.GetValue("F_054", i); - var f55 = this.View.Model.GetValue("F_055", i); - var f56 = this.View.Model.GetValue("F_056", i); - var f57 = this.View.Model.GetValue("F_057", i); - var f58 = this.View.Model.GetValue("F_058", i); - var f59 = this.View.Model.GetValue("F_059", i); - var f60 = this.View.Model.GetValue("F_060", i); - var f61 = this.View.Model.GetValue("F_061", i); - var f62 = this.View.Model.GetValue("F_062", i); - var f63 = this.View.Model.GetValue("F_063", i); - - #endregion - - string sql_3 = string.Format(@"Insert Into ReceivablesDetailsTable Values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}', - '{10}','{11}','{12}','{13}','{14}','{15}','{16}','{17}','{18}','{19}','{20}','{21}','{22}','{23}','{24}','{25}','{26}','{27}','{28}','{29}', - '{30}','{31}','{32}','{33}','{34}','{35}','{36}','{37}','{38}','{39}','{40}','{41}','{42}','{43}','{44}','{45}','{46}','{47}','{48}','{49}', - '{50}','{51}','{52}','{53}','{54}','{55}','{56}','{57}','{58}','{59}','{60}','{61}','{62}','{63}' - )", f1, f2, f3, f4, f5, f6, f7, f8, f9, - f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23, f24, f25, f26, - f27, f28, f29, f30, f31, f32, f33, f34, f35, f36, f37, f38, f39, f40, f41, f42, f43, f44, f45, f46, f47, - f48, f49, f50, f51, f52, f53, f54, f55, f56, f57, f58, f59, f0, f60, f61, f62, f63); - - DBUtils.ExecuteDynamicObject(Context, sql_3); - } + Loghelp.Log("MBBA_tbButton_2" + upsql); + DBUtils.ExecuteDynamicObject(Context, upsql); } + #region + //for (int i = 0; i < entries.Count; i++) + //{ + // var f = this.View.Model.GetValue("F_000", i)?.ToString(); + // if (f != "0" && entries[i]["F_666"]?.ToString() == "True") + // { + // #region 隐藏单据体赋值 + + // var f0 = this.View.Model.GetValue("F_000", i); + // var f1 = this.View.Model.GetValue("F_001", i); + // var f2 = this.View.Model.GetValue("F_002", i); + // var f3 = this.View.Model.GetValue("F_003", i); + // var f4 = this.View.Model.GetValue("F_004", i); + // var f5 = this.View.Model.GetValue("F_005", i); + // var f6 = this.View.Model.GetValue("F_006", i); + // var f7 = this.View.Model.GetValue("F_007", i); + // var f8 = this.View.Model.GetValue("F_008", i); + // var f9 = this.View.Model.GetValue("F_009", i); + // var f10 = this.View.Model.GetValue("F_010", i); + // var f11 = this.View.Model.GetValue("F_011", i); + // var f12 = this.View.Model.GetValue("F_012", i); + // var f13 = this.View.Model.GetValue("F_013", i); + // var f14 = this.View.Model.GetValue("F_014", i); + // var f15 = this.View.Model.GetValue("F_015", i); + // var f16 = this.View.Model.GetValue("F_016", i); + // var f17 = this.View.Model.GetValue("F_017", i); + // var f18 = this.View.Model.GetValue("F_018", i); + // var f19 = this.View.Model.GetValue("F_019", i); + // var f20 = this.View.Model.GetValue("F_020", i); + // var f21 = this.View.Model.GetValue("F_021", i); + // var f22 = this.View.Model.GetValue("F_022", i); + // var f23 = this.View.Model.GetValue("F_023", i); + // var f24 = this.View.Model.GetValue("F_024", i); + // var f25 = this.View.Model.GetValue("F_025", i); + // var f26 = this.View.Model.GetValue("F_026", i); + // var f27 = this.View.Model.GetValue("F_027", i); + // var f28 = this.View.Model.GetValue("F_028", i); + // var f29 = this.View.Model.GetValue("F_029", i); + // var f30 = this.View.Model.GetValue("F_030", i); + // var f31 = this.View.Model.GetValue("F_031", i); + // var f32 = this.View.Model.GetValue("F_032", i); + // var f33 = this.View.Model.GetValue("F_033", i); + // var f34 = this.View.Model.GetValue("F_034", i); + // var f35 = this.View.Model.GetValue("F_035", i); + // var f36 = this.View.Model.GetValue("F_036", i); + // var f37 = this.View.Model.GetValue("F_037", i); + // var f38 = this.View.Model.GetValue("F_038", i); + // var f39 = this.View.Model.GetValue("F_039", i); + // var f40 = this.View.Model.GetValue("F_040", i); + // var f41 = this.View.Model.GetValue("F_041", i); + // var f42 = this.View.Model.GetValue("F_042", i); + // var f43 = this.View.Model.GetValue("F_043", i); + // var f44 = this.View.Model.GetValue("F_044", i); + // var f45 = this.View.Model.GetValue("F_045", i); + // var f46 = this.View.Model.GetValue("F_046", i); + // var f47 = this.View.Model.GetValue("F_047", i); + // var f48 = this.View.Model.GetValue("F_048", i); + // var f49 = this.View.Model.GetValue("F_049", i); + // var f50 = this.View.Model.GetValue("F_050", i); + // var f51 = this.View.Model.GetValue("F_051", i); + // var f52 = this.View.Model.GetValue("F_052", i); + // var f53 = this.View.Model.GetValue("F_053", i); + // var f54 = this.View.Model.GetValue("F_054", i); + // var f55 = this.View.Model.GetValue("F_055", i); + // var f56 = this.View.Model.GetValue("F_056", i); + // var f57 = this.View.Model.GetValue("F_057", i); + // var f58 = this.View.Model.GetValue("F_058", i); + // var f59 = this.View.Model.GetValue("F_059", i); + // var f60 = this.View.Model.GetValue("F_060", i); + // var f61 = this.View.Model.GetValue("F_061", i); + // var f62 = this.View.Model.GetValue("F_062", i); + // var f63 = this.View.Model.GetValue("F_063", i); + + // #endregion + + + + // DBUtils.ExecuteDynamicObject(Context, sql_3); + // } + //} + #endregion } } @@ -190,6 +238,7 @@ namespace Pilot.Report.Exploitation.Receivables if (action.ReturnData != null) { + string wheresql = " 1=1 "; FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据 DynamicObject dyObj = returnData.CustomFilter as DynamicObject; //获取组织FID @@ -198,24 +247,36 @@ namespace Pilot.Report.Exploitation.Receivables if (FSaleOrg != null) { FSaleOrgId = Convert.ToString(FSaleOrg["ID"]); + wheresql += $@" and [F_000]={FSaleOrgId}"; } //获取开发日期 var FSDate = Convert.ToString(dyObj["F_YKQC_Date_re5"]); + if (!string.IsNullOrWhiteSpace(FSDate)) + { + wheresql += $@" and [F_012]>='{FSDate}'"; + } //获取结束日期 var FEDate = Convert.ToString(dyObj["F_YKQC_Date_apv"]); + if (!string.IsNullOrWhiteSpace(FEDate)) + { + wheresql += $@" and [F_012] <= '{FEDate}'"; + } + //获取合同类型 DynamicObject HTLX = dyObj["F_YKQC_Assistant_dvn"] as DynamicObject; string HTLXFid = ""; if (HTLX != null) { HTLXFid = Convert.ToString(HTLX["ID"]); + wheresql += $@" and [F_059] = '{HTLXFid}'"; } //获取购货单位 DynamicObject CUST = dyObj["F_YKQC_Base_qtr"] as DynamicObject; string CustFid = ""; if (CUST != null) { - CustFid = Convert.ToString(CUST["ID"]); + CustFid = Convert.ToString(CUST["name"]); + wheresql += $@" and [F_005] = '{CustFid}'"; } //获取销售员 DynamicObject XSY = dyObj["F_YKQC_Base_tzk"] as DynamicObject; @@ -223,6 +284,7 @@ namespace Pilot.Report.Exploitation.Receivables if (XSY != null) { XSYFid = Convert.ToString(XSY["ID"]); + wheresql += $@" and [销售员ID] = '{XSYFid}'"; } //获取项目名称 DynamicObject GCXM = dyObj["F_YKQC_Base_uky"] as DynamicObject; @@ -230,180 +292,187 @@ namespace Pilot.Report.Exploitation.Receivables if(GCXM != null) { GCXMFid = Convert.ToString(GCXM["NAME"]); + wheresql += $@" and [F_009] = '{GCXMFid}'"; } this.View.Model.DeleteEntryData("F_MBBA_Entity_qtr"); - //获取表 - var sql_1 = string.Format(@"Delete ReceivablesDetailsTable Where F_002='合计:';"); + //获取表1 + var sql_1 = ""; - sql_1 += string.Format(@"/*dialect*/Select * From (Select * From ReceivablesDetailsTable + sql_1 += string.Format($@"/*dialect*/Select * From (Select * From View_PerformanceSharing_yuyubo where {wheresql} Union ALL (Select - null,'','合计:','','','','','','','',SUM(F_010), - '','','','',SUM(F_015),'',SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),'',SUM(F_024),SUM(F_025), - '',SUM(F_027),'','','','','',SUM(F_033),'','',SUM(F_036),'','','','','','','','','','','','','','','','','','',SUM(F_055),'','','','','','','','','' - From ReceivablesDetailsTable)) W Order by W.F_001"); + null,null,'合计:',null,null,null,null,null,null,null,SUM(F_010), + null,null,null,null,null,null,SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),null,SUM(F_024),SUM(F_025), + null,SUM(F_027),null,null,null,null,null,null,null,null,SUM(F_036),null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 + From + (select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,F_024 ,F_025, + F_027,F_036 from + View_PerformanceSharing_yuyubo + where {wheresql} + ) a )) W Order by W.F_001"); - var sql_2 = string.Format(@"Delete ReceivablesDetailsTable Where F_002='合计:';"); + var sql_2 = ""; sql_2 += string.Format(@"/*dialect*/Select top 1 * From ReceivablesDetailsTable"); var sql_List2 = DBUtils.ExecuteDynamicObject(Context, sql_2); + //判断是否存在表 if (sql_List2.Count() <= 0) { /*this.View.ShowMessage("FSaleOrgId :" + FSaleOrgId + "," + "FSDate:" + FSDate + "," + "FEDate :" + FEDate + "," + "HTLXFid:" + HTLXFid + "," + "CustFid:" + CustFid + "," + "XSYFid:" + XSYFid + "," + "GCXMFid:" + GCXMFid);*/ - string sql = string.Format(@"/*dialect*/EXEC [GetReceiveData2] '{0}','{1}','{2}','{3}','{4}','{5}','{6}';", FSaleOrgId, FSDate, FEDate,HTLXFid - , CustFid, XSYFid, GCXMFid); + string sql = string.Format(@"/*dialect*/EXEC [PR_YingShouMingXi_yuyubo]"); var sqlList = DBUtils.ExecuteDynamicObject(Context, sql); - int Rowindex = this.View.Model.GetEntryRowCount("F_MBBA_Entity_qtr"); - this.View.Model.DeleteEntryData("F_MBBA_Entity_qtr"); + if (sqlList.Count() > 0) { string sql_3 = ""; const int batchSize = 1000; // 每批处理 1000 条数据 - for (int i = 0; i < sqlList.Count(); i++) - { - #region 隐藏单据体赋值 + #region + // for (int i = 0; i < sqlList.Count(); i++) + // { + // #region 隐藏单据体赋值 - var f1 = sqlList[i]["F_001"]; - var f2 = sqlList[i]["销售员"]; - var f3 = sqlList[i]["SBU"]; - var f4 = sqlList[i]["明细区域"]; - var f5 = sqlList[i]["购货单位"]; - var f6 = sqlList[i]["公司性质"]; - var f7 = sqlList[i]["客户信用"]; - var f8 = sqlList[i]["合同编号"]; - var f9 = sqlList[i]["项目名称"]; - decimal f10 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["订单总额"]?.ToString())) - { - f10 = Convert.ToDecimal(sqlList[i]["订单总额"]); - } - var f11 = sqlList[i]["签订年份"]; - var f12 = sqlList[i]["订单日期"]; - var f13 = sqlList[i]["收款条件"]; - var f14 = sqlList[i]["发货日期"]; - decimal f15 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["应收比例"]?.ToString())) - { - f15 = Convert.ToDecimal(sqlList[i]["应收比例"]); - } - var f16 = sqlList[i]["开票日期"]; - decimal f17 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["累计发货金额"]?.ToString())) - { - f17 = Convert.ToDecimal(sqlList[i]["累计发货金额"]); - } - decimal f18 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["累计退货金额"]?.ToString())) - { - f18 = Convert.ToDecimal(sqlList[i]["累计退货金额"]); - } - decimal f19 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["累计开票金额"]?.ToString())) - { - f19 = Convert.ToDecimal(sqlList[i]["累计开票金额"]); - } - decimal f20 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["累计到款金额"]?.ToString())) - { - f20 = Convert.ToDecimal(sqlList[i]["累计到款金额"]); - } - decimal f21 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["应收款合计"]?.ToString())) - { - f21 = Convert.ToDecimal(sqlList[i]["应收款合计"]); - } - decimal f22 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["未出货总额"]?.ToString())) - { - f22 = Convert.ToDecimal(sqlList[i]["未出货总额"]); - } - var f23 = ""; - if (!string.IsNullOrWhiteSpace(sqlList[i]["预计到期时间"]?.ToString())) - { - f23 = sqlList[i]["预计到期时间"]?.ToString(); - } - var f24 = Convert.ToDecimal(sqlList[i]["未到期金额"]); - decimal f25 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["实际已出货应收款合计"]?.ToString())) - { - f25 = Convert.ToDecimal(sqlList[i]["实际已出货应收款合计"]); - } - var f26 = ""; - if (!string.IsNullOrWhiteSpace(sqlList[i]["到期时间"]?.ToString())) - { - f26 = sqlList[i]["到期时间"]?.ToString(); - } - var f27 = Convert.ToDecimal(sqlList[i]["到期金额"]); - var f28 = sqlList[i]["收款人"]; - var f29 = sqlList[i]["项目阶段"]; - var f30 = sqlList[i]["项目进度"]; - var f31 = sqlList[i]["项目调试时间"]; - var f32 = sqlList[i]["项目验收时间"]; - decimal f33 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["质保金天数"]?.ToString())) - { - f33 = Convert.ToDecimal(sqlList[i]["质保金天数"]); - } - var f34 = sqlList[i]["质保金到期时间"]; - var f35 = sqlList[i]["提前验收"]; - decimal f36 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["账龄月"]?.ToString())) - { - f36 = Convert.ToDecimal(sqlList[i]["账龄月"]); - } - var f37 = sqlList[i]["账龄阶段"]; - var f38 = sqlList[i]["一到六个月"]; - var f39 = sqlList[i]["七到十二个月"]; - var f40 = sqlList[i]["十三到十八个月"]; - var f41 = sqlList[i]["十九个月以上"]; - var f42 = sqlList[i]["一年以上"]; ; - var f43 = sqlList[i]["风险评估级别"]; - var f44 = sqlList[i]["结算类别"]; - var f45 = sqlList[i]["结算类型"]; - var f46 = sqlList[i]["转专责小组时间"]; - var f47 = sqlList[i]["是否超账龄转出"]; - var f48 = sqlList[i]["超账龄是否申请归还大区"]; - var f49 = sqlList[i]["反馈表商务人员引用"]; - var f50 = sqlList[i]["反馈表引用分组"]; - var f51 = sqlList[i]["取值销售"]; - var f52 = sqlList[i]["是否坏账"]; - var f53 = sqlList[i]["是否预发货"]; - var f54 = sqlList[i]["预计回款时间"]; - decimal f55 = 0; - if (!string.IsNullOrWhiteSpace(sqlList[i]["预计回款金额"]?.ToString())) - { - f55 = Convert.ToDecimal(sqlList[i]["预计回款金额"]); - } - var f56 = sqlList[i]["情况分类"]; - var f57 = sqlList[i]["销售反馈情况"]; - var f58 = sqlList[i]["商务运营专责协助收款反馈情况"]; - var f59 = sqlList[i]["合同类型"]; - var f0 = sqlList[i]["组织"]; - var f60 = sqlList[i]["实际跟进人"]; - var f61 = sqlList[i]["销售收款分类"]; - var f62 = sqlList[i]["是否集采项目"]; - var f63 = sqlList[i]["天数"]; - #endregion + // var f1 = sqlList[i]["F_001"]; + // var f2 = sqlList[i]["销售员"]; + // var f3 = sqlList[i]["SBU"]; + // var f4 = sqlList[i]["明细区域"]; + // var f5 = sqlList[i]["购货单位"]; + // var f6 = sqlList[i]["公司性质"]; + // var f7 = sqlList[i]["客户信用"]; + // var f8 = sqlList[i]["合同编号"]; + // var f9 = sqlList[i]["项目名称"]; + // decimal f10 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["订单总额"]?.ToString())) + // { + // f10 = Convert.ToDecimal(sqlList[i]["订单总额"]); + // } + // var f11 = sqlList[i]["签订年份"]; + // var f12 = sqlList[i]["订单日期"]; + // var f13 = sqlList[i]["收款条件"]; + // var f14 = sqlList[i]["发货日期"]; + // decimal f15 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["应收比例"]?.ToString())) + // { + // f15 = Convert.ToDecimal(sqlList[i]["应收比例"]); + // } + // var f16 = sqlList[i]["开票日期"]; + // decimal f17 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["累计发货金额"]?.ToString())) + // { + // f17 = Convert.ToDecimal(sqlList[i]["累计发货金额"]); + // } + // decimal f18 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["累计退货金额"]?.ToString())) + // { + // f18 = Convert.ToDecimal(sqlList[i]["累计退货金额"]); + // } + // decimal f19 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["累计开票金额"]?.ToString())) + // { + // f19 = Convert.ToDecimal(sqlList[i]["累计开票金额"]); + // } + // decimal f20 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["累计到款金额"]?.ToString())) + // { + // f20 = Convert.ToDecimal(sqlList[i]["累计到款金额"]); + // } + // decimal f21 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["应收款合计"]?.ToString())) + // { + // f21 = Convert.ToDecimal(sqlList[i]["应收款合计"]); + // } + // decimal f22 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["未出货总额"]?.ToString())) + // { + // f22 = Convert.ToDecimal(sqlList[i]["未出货总额"]); + // } + // var f23 = ""; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["预计到期时间"]?.ToString())) + // { + // f23 = sqlList[i]["预计到期时间"]?.ToString(); + // } + // var f24 = Convert.ToDecimal(sqlList[i]["未到期金额"]); + // decimal f25 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["实际已出货应收款合计"]?.ToString())) + // { + // f25 = Convert.ToDecimal(sqlList[i]["实际已出货应收款合计"]); + // } + // var f26 = ""; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["到期时间"]?.ToString())) + // { + // f26 = sqlList[i]["到期时间"]?.ToString(); + // } + // var f27 = Convert.ToDecimal(sqlList[i]["到期金额"]); + // var f28 = sqlList[i]["收款人"]; + // var f29 = sqlList[i]["项目阶段"]; + // var f30 = sqlList[i]["项目进度"]; + // var f31 = sqlList[i]["项目调试时间"]; + // var f32 = sqlList[i]["项目验收时间"]; + // decimal f33 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["质保金天数"]?.ToString())) + // { + // f33 = Convert.ToDecimal(sqlList[i]["质保金天数"]); + // } + // var f34 = sqlList[i]["质保金到期时间"]; + // var f35 = sqlList[i]["提前验收"]; + // decimal f36 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["账龄月"]?.ToString())) + // { + // f36 = Convert.ToDecimal(sqlList[i]["账龄月"]); + // } + // var f37 = sqlList[i]["账龄阶段"]; + // var f38 = sqlList[i]["一到六个月"]; + // var f39 = sqlList[i]["七到十二个月"]; + // var f40 = sqlList[i]["十三到十八个月"]; + // var f41 = sqlList[i]["十九个月以上"]; + // var f42 = sqlList[i]["一年以上"]; ; + // var f43 = sqlList[i]["风险评估级别"]; + // var f44 = sqlList[i]["结算类别"]; + // var f45 = sqlList[i]["结算类型"]; + // var f46 = sqlList[i]["转专责小组时间"]; + // var f47 = sqlList[i]["是否超账龄转出"]; + // var f48 = sqlList[i]["超账龄是否申请归还大区"]; + // var f49 = sqlList[i]["反馈表商务人员引用"]; + // var f50 = sqlList[i]["反馈表引用分组"]; + // var f51 = sqlList[i]["取值销售"]; + // var f52 = sqlList[i]["是否坏账"]; + // var f53 = sqlList[i]["是否预发货"]; + // var f54 = sqlList[i]["预计回款时间"]; + // decimal f55 = 0; + // if (!string.IsNullOrWhiteSpace(sqlList[i]["预计回款金额"]?.ToString())) + // { + // f55 = Convert.ToDecimal(sqlList[i]["预计回款金额"]); + // } + // var f56 = sqlList[i]["情况分类"]; + // var f57 = sqlList[i]["销售反馈情况"]; + // var f58 = sqlList[i]["商务运营专责协助收款反馈情况"]; + // var f59 = sqlList[i]["合同类型"]; + // var f0 = sqlList[i]["组织"]; + // var f60 = sqlList[i]["实际跟进人"]; + // var f61 = sqlList[i]["销售收款分类"]; + // var f62 = sqlList[i]["是否集采项目"]; + // var f63 = sqlList[i]["天数"]; + // #endregion - sql_3 += string.Format(@"Insert Into ReceivablesDetailsTable Values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}', -'{10}','{11}','{12}','{13}','{14}','{15}','{16}','{17}','{18}','{19}','{20}','{21}','{22}','{23}','{24}','{25}','{26}','{27}','{28}','{29}', -'{30}','{31}','{32}','{33}','{34}','{35}','{36}','{37}','{38}','{39}','{40}','{41}','{42}','{43}','{44}','{45}','{46}','{47}','{48}','{49}', -'{50}','{51}','{52}','{53}','{54}','{55}','{56}','{57}','{58}','{59}','{60}','{61}','{62}','{63}' -)", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23, f24, f25, f26, - f27, f28, f29, f30, f31, f32, f33, f34, f35, f36, f37, f38, f39, f40, f41, f42, f43, f44, f45, f46, f47, - f48, f49, f50, f51, f52, f53, f54, f55, f56, f57, f58, f59, f0, f60, f61, f62, f63); + // sql_3 += string.Format(@"Insert Into ReceivablesDetailsTable Values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}', + //'{10}','{11}','{12}','{13}','{14}','{15}','{16}','{17}','{18}','{19}','{20}','{21}','{22}','{23}','{24}','{25}','{26}','{27}','{28}','{29}', + //'{30}','{31}','{32}','{33}','{34}','{35}','{36}','{37}','{38}','{39}','{40}','{41}','{42}','{43}','{44}','{45}','{46}','{47}','{48}','{49}', + //'{50}','{51}','{52}','{53}','{54}','{55}','{56}','{57}','{58}','{59}','{60}','{61}','{62}','{63}' + //)", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22, f23, f24, f25, f26, + // f27, f28, f29, f30, f31, f32, f33, f34, f35, f36, f37, f38, f39, f40, f41, f42, f43, f44, f45, f46, f47, + // f48, f49, f50, f51, f52, f53, f54, f55, f56, f57, f58, f59, f0, f60, f61, f62, f63); - if ((i + 1) % batchSize == 0 || i == sqlList.Count() - 1) - { - DBUtils.ExecuteDynamicObject(Context, sql_3); - sql_3 = ""; - } - } + // if ((i + 1) % batchSize == 0 || i == sqlList.Count() - 1) + // { + // DBUtils.ExecuteDynamicObject(Context, sql_3); + // sql_3 = ""; + // } + // } + #endregion } } var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1); diff --git a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs index 7070dea..fd7c8fd 100644 --- a/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs +++ b/Pilot.Report.Exploitation/ResultsKanbanSummary/ResultsKanbanSumReport.cs @@ -688,16 +688,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 new file mode 100644 index 0000000..9f540bb Binary files /dev/null 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 new file mode 100644 index 0000000..713788b Binary files /dev/null and b/Pilot.Report.Exploitation/bin/Debug/Pilot.Report.Exploitation.pdb differ diff --git a/Pilot.Report.Exploitation/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/Pilot.Report.Exploitation/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs deleted file mode 100644 index 15efebf..0000000 --- a/Pilot.Report.Exploitation/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/Pilot.Report.Exploitation/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Pilot.Report.Exploitation/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index c89176e..0000000 Binary files a/Pilot.Report.Exploitation/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/Pilot.Report.Exploitation/obj/Debug/Pilot.Re.5836546F.Up2Date b/Pilot.Report.Exploitation/obj/Debug/Pilot.Re.5836546F.Up2Date deleted file mode 100644 index e69de29..0000000 diff --git a/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.csproj.CopyComplete b/Pilot.Report.Exploitation/obj/Debug/Pilot.Report.Exploitation.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/应收明细SQL.sql b/应收明细SQL.sql new file mode 100644 index 0000000..2f24730 --- /dev/null +++ b/应收明细SQL.sql @@ -0,0 +1,276 @@ + + +-- 洢Ƿڣɾ +IF OBJECT_ID('dbo.[PR_YingShouMingXi_yuyubo]', 'P') IS NOT NULL +BEGIN + DROP PROCEDURE dbo.PR_YingShouMingXi_yuyubo; + PRINT '洢 dbo.[PR_YingShouMingXi_yuyubo] ɾ'; +END +GO + +-- µĴ洢 +CREATE PROCEDURE dbo.PR_YingShouMingXi_yuyubo +AS +BEGIN + -- 洢߼ + + + TRUNCATE TABLE ZRP_YingShouMingXi_yuyubo; + insert into ZRP_YingShouMingXi_yuyubo + ([۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] + ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], + [ۼ˻],[ۼƿƱ],[ۼƵ],[ԤƵʱ],[ʱ],[ʱ],[PMSʱ],[Ŀ],[Ŀʱ], + [Ŀʱ],[ʱʱ],[Ƿǰ],[],[],[],[תרСʱ],[Ƿת],[Ƿ黹], + [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],[ܶ],[Ӧձ],[ۼƷ] + ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], + [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[]) +SELECT +[۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] + ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], + [ۼ˻],[ۼƿƱ],[ۼƵ],[ԤƵʱ],[ʱ],[ʱ],[PMSʱ],[Ŀ],[Ŀʱ], + [Ŀʱ],[ʱʱ],[Ƿǰ],[],[],[],[תרСʱ],[Ƿת],[Ƿ黹], + [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],0 [ܶ],[Ӧձ], 0 [ۼƷ] + ,0 [ۼ˻],0 [ۼƿƱ],0 [Ӧտϼ],0 [δܶ],0 [δڽ],NULL [ʱ],0 [ڽ],0 [ʵѳӦտϼ],NULL [Ŀ׶],NULL [տ],0 [ۼƵ], +NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-׶],NULL [],[֯ID],[] +FROM ( +SELECT A.FID [۵ID] +,ISNULL(O.fid,l.fid) [ԱID] +,isnull(w.FENTRYID,0) [տID], ISNULL(w.FNAME,'') AS [տ], W.F_RecConditionId +,(SELECT FBILLALLAMOUNT_LC FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID )AS [ܶ] +,ISNULL(O.FNAME,L.FNAME) AS [Ա],CONVERT(DECIMAL(18,2),ISNULL(n.FSHARERATE,100)) AS [̯] +,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBILLALLAMOUNT_LC)) [̯] + ,ISNULL(ACO.,ACL.) AS [SBU] , ISNULL (ACO.[ϸ] , ACL.ϸ) AS [ϸ],c.FNAME AS [λ] ,ISNULL(K.FDATAVALUE,'') AS [˾] + ,P.FDATAVALUE AS [ͻ],A.F_contractnumber AS [ֽʺͬ] , G.FNAME as [Ŀ] + ,convert( nvarchar(10), year(A.FAPPROVEDATE)) AS [ǩ],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS [] + ,[]=ISNULL((SELECT (CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)) AS '' FROM T_SAL_DELIVERYNOTICE SAL + INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID + WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'') + ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBILLALLAMOUNT_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL + INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID + WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),0) + + ,[Ʊ]=ISNULL((CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN T.Ʊ ELSE T.ûкɫĿƱ END ),'') + ,[ۼ˻]=isnull(( + SELECT SUM(B.FBILLALLAMOUNT_LC) AS 'ۼ˻' + FROM T_SAL_RETURNSTOCK AA + INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID + WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0) + + ,[ۼƿƱ] =ISNULL( CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN AD.Ʊܽ ELSE AD.[Ʊܽ(Ʊ)] END,0) + ,[ۼƵ]=ISNULL(ae.ۼտ,0) + ,[ԤƵʱ]=FaHuoRiQi.[ԤƵʱ] + + ,[ʱ]=W.FRECADVANCEAMOUNT + ,[ʱ]=W.F_DAY + ,[PMSʱ]=W.F_DAY + + ,a.F_XMJDD AS 'Ŀ' --ȡ۶-۽ + ,convert(nvarchar(10),a.F_XMTSSJ,23) AS 'Ŀʱ' --ȡĿʱ + ,convert(nvarchar(10),a.F_XMYSSJ,23) AS 'Ŀʱ' --ȡĿʱ + ,convert(nvarchar(10),dateadd(day,isnull(w.f_day,0) ,w.F_PMSDate),23) AS 'ʱʱ' + ,[Ƿǰ]=case when a.F_YYS = 0 then '' else '' end + ,[]= ISNULL( ROUND( DATEDIFF(DAY,convert(nvarchar(10),dateadd(day,isnull(w.f_day,0) ,W.F_PMSDate),23),Getdate()) / 30,0) ,0 ) + ----,CASE WHEN A.F_OrderType in ('DZ','YB') THEN 'Ԫ' ELSE s.FCAPTION END AS '' --ȡ۶-ͷ-#ֵΪDZʱijԪΪϵͳ + ,[]=(select top 1 case when s.FCAPTION = 'DZ' THEN 'Ԫ' ELSE s.FCAPTION END from T_META_FORMENUMITEM R + LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 + where r.FVALUE = A.F_OrderType ) + ,(select top 1 case when S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' then 'Ŀ꣬زֿ' + WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' then 'Ŀδ깤Ƿͬ' + WHEN S.FCAPTION <> 'DZ' AND w.FID is not null then '' + WHEN S.FCAPTION <> 'DZ' AND w.FID is not null then 'Э鸶' + ELSE 'Ԥտ+/Կ+ʱ' END from T_META_FORMENUMITEM R + LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 + where r.FVALUE = A.F_OrderType) AS '' + ,isnull(convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS 'תרСʱ' + ,case when convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23) is null then '' else '' end AS 'Ƿת' + ,'' AS 'Ƿ黹' -- + ,'' AS 'Ա' -- + ,'' AS '÷' -- + ,'' AS 'ȡֵ' -- + ,case when FIsBadDebt = 1 then '' else '' end AS 'Ƿ' --ȡ۶ϵǷ + ,CASE WHEN AB.F_PAPERCONTRACT IS NULL THEN '' else '' end AS 'ǷԤ' --ȡ۶ϵǷԤ + ,CASE WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'LH' THEN '' + WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'BL' THEN 'ز' + WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'HR' THEN '' + WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'N' THEN '' + WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'HEF' THEN 'Ǽ' + WHEN ISNULL(A.F_PURCHASINGPRO,'') = 'LD' THEN '̵' + ELSE '' END as 'Ƿ񼯲Ŀ' + ,B.FDATAVALUE as 'ͬ' + ,[ǷѴ]=0 + ,[Ӧձ]=w.FRECADVANCERATE + ,A.FSALEORGID as '֯ID' + ,W.F_DAY AS '' + -----------------from -------- + + FROM T_SAL_ORDER A WITH(NOLOCK) + LEFT JOIN ( + SELECT DISTINCT x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%' AS FNAME + ,w.FID,w.F_PMSDate + ,W.FRECADVANCEAMOUNT,w.F_DAY + ,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE + FROM T_SAL_ORDERPLAN w WITH(NOLOCK) + INNER JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId + ) w ON w.FID=A.FID + left join (Select a2.FENTRYID,a2.FDATAVALUE From T_BAS_ASSISTANTDATAENTRY a1 JOIN T_BAS_ASSISTANTDATAENTRY_L a2 on a1.FENTRYID = a2.FENTRYID + Where a1.FID = '670cc977263353') B on A.F_ORDERCATEGORY = B.FENTRYID + LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 + left JOIN T_PerformanceSharingEntry TPS ON TPS.fid=a.FID + LEFT JOIN V_BD_SALESMAN_L L WITH(NOLOCK) ON L.fid = A.FSALERID + left JOIN T_PerformanceSharing M WITH(NOLOCK) ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C' + left JOIN T_PerformanceSharingEntry N WITH(NOLOCK) ON N.FID=M.FID + LEFT JOIN V_BD_SALESMAN_L O WITH(NOLOCK) ON O.fid= N.FSALEID + LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.ϸ,'') != '' + LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.=L.FNAME AND ISNULL(ACL.ϸ,'') != '' + LEFT JOIN T_SAL_ORDERFIN fin WITH(NOLOCK) ON a.FID=fin.FID + LEFT JOIN T_BD_CUSTOMER I WITH(NOLOCK) ON I .FCUSTID = A.FCUSTID + lEFT JOIN V_ASSISTANTDATA K WITH(NOLOCK) ON K.FENTRYID = i.FCompanyNature + LEFT JOIN V_ASSISTANTDATA P WITH(NOLOCK) ON P.FENTRYID = I.F_CREDITCLASSIFICATION + LEFT JOIN T_BAS_PREBDONE_L G WITH(NOLOCK) ON G.FID = A.F_projectname AND G.FLocaleID =2052 + LEFT JOIN + ( + SELECT F_Paper ,CONVERT(NVARCHAR(10), MAX(FDATE),23) AS 'Ʊ' + ,CONVERT(NVARCHAR(10), MAX(FDATE),23) AS 'ûкɫĿƱ' + FROM t_AR_receivable A + INNER JOIN T_AR_RECEIVABLEENTRY B ON A.FID = B.FID + WHERE A.FDOCUMENTSTATUS = 'C' AND A.FCancelStatus = 'A' + GROUP BY F_Paper + ) T ON T.F_PAPER = A.F_contractnumber + LEFT JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory + + LEFT JOIN + ( + SELECT + F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS 'Ʊܽ', + CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS 'Ʊܽ(Ʊ)' + FROM t_AR_receivable A + INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID + GROUP BY F_Papercontract + ) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber + LEFT join + ( + SELECT a.F_Papercontract, + sum(d.FCURWRITTENOFFAMOUNT) as 'ۼտ' + FROM t_AR_receivable A + INNER JOIN T_AR_RECEIVABLEENTRY E ON E.FID =A.FID + INNER JOIN T_AR_RECMacthLogENTRY B ON A.FBILLNO = B.FSRCBILLNO + INNER JOIN T_AR_RECMacthLog C ON C.FID = B.FID + INNER JOIN T_AR_RECMacthLogENTRY D ON D.FID = B.FID + AND D.FSOURCETYPE = '36cf265bd8c3452194ed9c83ec5e73d2' + WHERE + 1=1 + group by a.F_Papercontract + ) AE ON AE.F_Papercontract = A.F_contractnumber + LEFT JOIN + (select FID,max([ԤƵʱ]) AS [ԤƵʱ] FROM + (select plan1.FID ,CASE + WHEN X.FNAME in ('Ԥ(DZ)','Ԥ(ϵͳ)') THEN CONVERT(NVARCHAR, AA.FDATE, 120) + WHEN X.FNAME in ('տ(DZ)','տ(ϵͳ)') AND DATEADD(day, plan1.F_DAY, CK.F_SFSIGNATURETIME) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY, 0), ISNULL(CK.F_SFSIGNATURETIME,'')) , 120) + WHEN X.FNAME in ('Ʊտ(ϵͳ)','Ʊտ(DZ)') AND DATEADD(day, plan1.F_DAY,FP.F_DATE) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(FP.F_DATE,'')) , 120) + WHEN X.FNAME in ('(DZ)','(ϵͳ)') AND DATEADD(day, plan1.F_DAY,Q.) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(Q.,'')) , 120) + ELSE '' --EXEC [GetReceiveData2] '100302','',''; + END AS 'ԤƵʱ' --۶-ƻ-PMS# + from + T_SAL_ORDER AA + left join + T_SAL_ORDERPLAN plan1 on plan1.FID=aa.FID + + LEFT JOIN T_BD_RecCondition_L X on X.FID = plan1.F_RecConditionId + LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER --۳ⵥ + LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER --ֵ˰ר÷Ʊ + LEFT JOIN + ( + SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), AA.FDATE,23)) AS '',SUM(B.FBILLALLAMOUNT_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE AA + INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON AA.FID =B.FID + WHERE AA.FDOCUMENTSTATUS= 'C' + GROUP BY AA.F_Papercontract + ) Q ON Q.F_PAPERCONTRACT = aa.F_contractnumber --ȡ֪ͨķ + + ) FaHuoRiQi1 + GROUP BY FID + ) FaHuoRiQi on FaHuoRiQi.FID=a.fid + LEFT JOIN (SELECT distinct F_Papercontract FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='') AB ON AB.F_PAPERCONTRACT = A.F_contractnumber + + WHERE ( ( A.FSALEORGID = 100302 AND + ACO. != '̼ǿ' + OR ACL. != '̼ǿ' + OR C.FNAME NOT IN ('ŵƼۣ޹˾','人ŵƼչ޹˾') + OR L.FNAME NOT IN ('ŵ') ) OR A.FSALEORGID != 100302) AND A.FManualClose <> '1' AND A.FDocumentStatus = 'C' + AND EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid AND bb.FManualRowClose <> '1' ) + ) A + --where [۵ID]= 102802 + --where [̯]< 100 + --where [ԤƵʱ] !='' + WHERE [ܶ]<>0 AND SUBSTRING([ֽʺͬ],0,1)!='Z' + ORDER BY A.[۵ID],[ԱID] + +update [ZRP_YingShouMingXi_yuyubo] set [ܶ]=[̯],[ۼƷ]=[ۼƷ]*[̯]*0.01,[ۼ˻]=[ۼ˻]*[̯]*0.01 +,[ۼƿƱ]=[ۼƿƱ]*[̯]*0.01,[ۼƵ]=[ۼƵ]*[̯]*0.01 +,[Ӧտϼ]=[̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01,[δܶ]=[̯]-[ۼƷ]*[̯]*0.01 +,[δڽ]=CASE WHEN [ԤƵʱ] <'1990-01-01' OR [ԤƵʱ] > GETDATE() THEN ([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01 ELSE 0 END + +,[ʱ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN [ԤƵʱ] ELSE NULL END +,[ڽ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01 ELSE 0 END +,[ʵѳӦտϼ]=([ۼƷ]-[ۼ˻]- [ۼƵ] )*[̯]*0.01 +,[տ]=CASE WHEN []>6 THEN 'תӦרС' ELSE [Ա] END +,[Ŀ׶]= CASE WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ],0) = 0 THEN 'δ' +WHEN ISNULL( [ۼƷ],0) = ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ],0) then '' END +,[-׶]=CASE WHEN []>=1 AND []<=6 THEN '1-6' WHEN []>=7 AND []<=12 THEN '7-12' WHEN []>=13 AND []<=18 + THEN '13-18' WHEN []>=19 THEN '19' ELSE '' END + ,[]=CASE WHEN []>=1 AND []<=6 THEN '' WHEN []>=7 AND []<=12 THEN '߿' WHEN []>=13 AND []<=18 + THEN 'ʦ' WHEN []>=19 THEN '' ELSE '' END + ,[1-6]=CASE WHEN []>=1 AND []<=6 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[7-12]=CASE WHEN []>=7 AND []<=12 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[13-18]=CASE WHEN []>=13 AND []<=18 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[19]=CASE WHEN []>=19 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END + ,[1]=CASE WHEN []>=12 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END +FROM [ZRP_YingShouMingXi_yuyubo] A + +update [ZRP_YingShouMingXi_yuyubo] SET []=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END ,[]=CASE WHEN [] > '1990-01-01' THEN [] ELSE NULL END + ,[Ʊ]=CASE WHEN [Ʊ] > '1990-01-01' THEN [Ʊ] ELSE NULL END ,[ԤƵʱ]=CASE WHEN [ԤƵʱ] > '1990-01-01' THEN [ԤƵʱ] ELSE NULL END + ,[ʱʱ]=CASE WHEN [ʱʱ] > '1990-01-01' THEN [ʱʱ] ELSE NULL END + ,[תרСʱ]=CASE WHEN [תרСʱ] > '1990-01-01' THEN [תרСʱ] ELSE NULL END + + + update [ReceivablesDetailsTable] set [F_001]=b.[۵ID],[F_002]=b.[Ա],[F_003]=b.[SBU],[F_004]=B.[ϸ],[F_005]=b.[λ],[F_006]=b.[˾] + ,[F_007]=[ͻ],[F_008]=[ֽʺͬ],[F_009]=[Ŀ],[F_010]=[ܶ],[F_011]=[ǩ],[F_012]=CONVERT(NVARCHAR(20),[],23),[F_013]=[տ],[F_014]=CONVERT(NVARCHAR(20),[],23) + ,[F_015]=[Ӧձ],[F_016]=CONVERT(NVARCHAR(20),[Ʊ],23),[F_017]=[ۼƷ],[F_018]=[ۼ˻],[F_019]=[ۼƿƱ],[F_020]=[ۼƵ],[F_021]=[Ӧտϼ] + ,[F_022]=[δܶ],[F_023]=CONVERT(NVARCHAR(20),[ԤƵʱ],23),[F_024]=[δڽ],[F_025]=[ʵѳӦտϼ],[F_026]=[ʱ],[F_027]=[ڽ],[F_028]=[տ] + ,[F_029]=[Ŀ׶],[F_030]=[Ŀ],[F_031]=[Ŀʱ],[F_032]=[Ŀʱ],[F_033]=[ʱ],[F_034]=CONVERT(NVARCHAR(20),[ʱʱ],23),[F_035]=[Ƿǰ] + ,[F_036]=[],[F_037]=[-׶],[F_038]=[1-6],[F_039]=[7-12],[F_040]=[13-18],[F_041]=[19],[F_042]=[1],[F_043]=[] + ,[F_044]=[],[F_045]=[],[F_046]=CONVERT(NVARCHAR(20),[תרСʱ],23),[F_047]=[Ƿת],[F_048]=[Ƿ黹],[F_049]=[Ա] + ,[F_050]=[÷],[F_051]=[ȡֵ],[F_052]=[Ƿ],[F_053]=[ǷԤ] + ,[F_059]=[ͬ],[F_000]=[֯ID],[F_062]=[Ƿ񼯲Ŀ],[F_063]=[],[EditTime]=GETDATE() + FROM [ZRP_YingShouMingXi_yuyubo] B + WHERE [ReceivablesDetailsTable].[ԱID]=b.[ԱID] AND [ReceivablesDetailsTable].[۵ID]=B.[۵ID] + AND [ReceivablesDetailsTable].[տID]=B.[տID] + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ǷѴ]=1 + FROM [ReceivablesDetailsTable] + WHERE [ReceivablesDetailsTable].[ԱID]=[ZRP_YingShouMingXi_yuyubo].[ԱID] AND [ReceivablesDetailsTable].[۵ID]=[ZRP_YingShouMingXi_yuyubo].[۵ID] + AND [ReceivablesDetailsTable].[տID]=[ZRP_YingShouMingXi_yuyubo].[տID] + + DELETE [ReceivablesDetailsTable] WHERE [۵ID] IS NULL OR [۵ID]=0 ; + INSERT INTO [ReceivablesDetailsTable] + ( [F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020] + ,[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040], + [F_041],[F_042] ,[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_059],[F_000] ,[F_062],[F_063],[۵ID],[ԱID],[տID],[EditTime],[IfManualEdit]) + + SELECT [۵ID],[Ա],[SBU],[ϸ],[λ],[˾],[ͻ] ,[ֽʺͬ],[Ŀ],[ܶ],[ǩ],CONVERT(NVARCHAR(20),[],23),[տ],CONVERT(NVARCHAR(20), [],23), + [Ӧձ],CONVERT(NVARCHAR(20),[Ʊ],23),[ۼƷ],[ۼ˻],[ۼƿƱ],[ۼƵ],[Ӧտϼ],[δܶ],CONVERT(NVARCHAR(20),[ԤƵʱ],23) + ,[δڽ],[ʵѳӦտϼ],CONVERT(NVARCHAR(20),[ʱ],23) + ,[ڽ],[տ],[Ŀ׶],[Ŀ],[Ŀʱ],[Ŀʱ],[ʱ],CONVERT(NVARCHAR(20),[ʱʱ],23),[Ƿǰ],[],[-׶],[1-6],[7-12],[13-18],[19] + ,[1],[],[],[],CONVERT(NVARCHAR(20),[תרСʱ],23),[Ƿת],[Ƿ黹],[Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ] + ,[ͬ] ,[֯ID],[Ƿ񼯲Ŀ],[] + ,[۵ID],[ԱID],[տID],GETDATE(),0 + FROM [ZRP_YingShouMingXi_yuyubo] WHERE ISNULL([ǷѴ],0)=0 + + DELETE [ReceivablesDetailsTable] + WHERE [۵ID] IN (SELECT DISTINCT [۵ID] FROM [ZRP_YingShouMingXi_yuyubo] WHERE [ۼƵ]=[ܶ]-[ۼ˻]) + +END +GO + + + +