diff --git a/.vs/GZ_LTHReportForms.csproj.dtbcache.json b/.vs/GZ_LTHReportForms.csproj.dtbcache.json new file mode 100644 index 0000000..6169ee9 --- /dev/null +++ b/.vs/GZ_LTHReportForms.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"E:\\GZC#Code\\派诺\\PiolotTH_ReportFrom","ProjectFileName":"GZ_LTHReportForms.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DDWFHMX.cs"},{"SourceFile":"JiXiaoKanBan\\ResultsKanbanSumReport.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"ReportGSH\\FormServicePlugIn.cs"},{"SourceFile":"YeJiPaiHangBang\\PHBSaleOrderReport.cs"},{"SourceFile":"YingShouBaoBiao\\YingShouHTXZ.cs"},{"SourceFile":"YingShouBaoBiao\\YingShouQDNF.cs"},{"SourceFile":"YingShouBaoBiao\\YingShouSBU.cs"},{"SourceFile":"YingShouBaoBiao\\YingShouQKBiao.cs"},{"SourceFile":"YSKDZGongNeng_JY\\LiteVersionPlugIn.cs"},{"SourceFile":"YSKDZGongNeng_JY\\ProgramNumber.cs"},{"SourceFile":"YSKDZGongNeng_JY\\YourDataPlugIn.cs"},{"SourceFile":"YSZKDZBaoBiao\\AccountsReceivableFiter.cs"},{"SourceFile":"YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs"},{"SourceFile":"YSZKDZBaoBiao\\AccountsReceivableReport.cs"},{"SourceFile":"YSZKDZBaoBiao\\AccountsReceivableReport2.cs"},{"SourceFile":"YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs"},{"SourceFile":"YSZKDZGongNeng_MX\\YourDataPlugIn2.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\GZC#Code\\GZ_LTHUPDATEVIEW\\bin\\Debug\\Kingdee.BOS.App.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\GZ_LTHUPDATEVIEW\\bin\\Debug\\Kingdee.BOS.Contracts.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\GZ_LTHUPDATEVIEW\\bin\\Debug\\Kingdee.BOS.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\GZ_LTHYJZZHTH\\bin\\Debug\\Kingdee.BOS.DataEntity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\GZ_LTHUPDATEVIEW\\bin\\Debug\\Kingdee.BOS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\派诺裴豪-报表\\派诺报表\\代码\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\bin\\Debug\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\派诺裴豪-报表\\派诺报表\\代码\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\bin\\Debug\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\派诺裴豪-报表\\派诺报表\\代码\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\bin\\Debug\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\GZC#Code\\派诺裴豪-报表\\派诺报表\\代码\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\bin\\Debug\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\GZC#Code\\派诺\\PiolotTH_ReportFrom\\bin\\Debug\\GZ_LTHReportForms.dll","OutputItemRelativePath":"GZ_LTHReportForms.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/CodeChunks.db b/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/CodeChunks.db new file mode 100644 index 0000000..a56c040 Binary files /dev/null and b/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/CodeChunks.db differ diff --git a/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/SemanticSymbols.db b/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/SemanticSymbols.db new file mode 100644 index 0000000..1229230 Binary files /dev/null and b/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/SemanticSymbols.db differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/03001a07-4607-4a3b-8a03-9c67699d55dd.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/03001a07-4607-4a3b-8a03-9c67699d55dd.vsidx new file mode 100644 index 0000000..200c7f6 Binary files /dev/null and b/.vs/GZ_LTHReportForms/FileContentIndex/03001a07-4607-4a3b-8a03-9c67699d55dd.vsidx differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/196a50f0-1df5-41c9-b41d-48bcd8f84b2d.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/196a50f0-1df5-41c9-b41d-48bcd8f84b2d.vsidx new file mode 100644 index 0000000..6387121 Binary files /dev/null and b/.vs/GZ_LTHReportForms/FileContentIndex/196a50f0-1df5-41c9-b41d-48bcd8f84b2d.vsidx differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/913d823f-801e-4fe2-97e5-9ab936a3ae54.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/913d823f-801e-4fe2-97e5-9ab936a3ae54.vsidx new file mode 100644 index 0000000..fb21648 Binary files /dev/null and b/.vs/GZ_LTHReportForms/FileContentIndex/913d823f-801e-4fe2-97e5-9ab936a3ae54.vsidx differ diff --git a/.vs/GZ_LTHReportForms/v17/.suo b/.vs/GZ_LTHReportForms/v17/.suo index 76d5e9f..450eb88 100644 Binary files a/.vs/GZ_LTHReportForms/v17/.suo and b/.vs/GZ_LTHReportForms/v17/.suo differ diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json index bc1659b..758dd78 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json @@ -1,10 +1,30 @@ { "Version": 1, - "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\", + "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\yingshoubaobiao\\yingshouqkbiao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yingshoubaobiao\\yingshouqkbiao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yszkdzbaobiao\\accountsreceivablereport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablereport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yszkdzbaobiao\\accountsreceivablereport2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablereport2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" } ], "DocumentGroupContainers": [ @@ -14,19 +34,54 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 2, "Children": [ + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql ", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql", + "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql", + "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-03T08:51:03.533Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql ", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-03T08:50:36.431Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 0, - "Title": "YingShouQKBiao.cs", - "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", - "RelativeDocumentMoniker": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs*", - "RelativeToolTip": "YingShouBaoBiao\\YingShouQKBiao.cs*", - "ViewState": "AgIAABAAAAAAAAAAAAAAACMAAAAUAAAAAAAAAA==", + "Title": "AccountsReceivableReport.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "ViewState": "AgIAAIYAAAAAAAAAAAAUwJMAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-24T06:57:25.107Z", + "WhenOpened": "2025-07-03T08:49:22.986Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "AccountsReceivableReport2.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "ViewState": "AgIAAEUAAAAAAAAAAAAQwFUAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T08:00:06.831Z", "EditorCaption": "" } ] diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json index 6036d91..0fe415e 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json @@ -1,10 +1,30 @@ { "Version": 1, - "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\", + "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\yingshoubaobiao\\yingshouqkbiao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yingshoubaobiao\\yingshouqkbiao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\ddwfhmx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:ddwfhmx.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yszkdzbaobiao\\accountsreceivablereport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablereport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\yszkdzbaobiao\\accountsreceivablereport2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablereport2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame", + "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" } ], "DocumentGroupContainers": [ @@ -19,15 +39,63 @@ { "$type": "Document", "DocumentIndex": 0, - "Title": "YingShouQKBiao.cs", - "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", - "RelativeDocumentMoniker": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u62A5\u8868\u5F00\u53D1(\u5929\u534E)\\YingShouBaoBiao\\YingShouQKBiao.cs", - "RelativeToolTip": "YingShouBaoBiao\\YingShouQKBiao.cs", - "ViewState": "AgIAAF0AAAAAAAAAAAAAwJ8AAAA+AAAAAAAAAA==", + "Title": "DDWFHMX.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\DDWFHMX.cs", + "RelativeDocumentMoniker": "DDWFHMX.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\DDWFHMX.cs", + "RelativeToolTip": "DDWFHMX.cs", + "ViewState": "AgIAAGwAAAAAAAAAAAAYwHkAAABQAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-06-24T06:57:25.107Z", + "WhenOpened": "2025-07-04T09:07:35.894Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql ", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql", + "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql", + "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFASQL).sql ", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-03T08:51:03.533Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "RelativeToolTip": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613\u521B\u5EFA).sql", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-03T08:50:36.431Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "AccountsReceivableReport.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableReport.cs", + "ViewState": "AgIAAIYAAAAAAAAAAAAUwJMAAAAjAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T08:49:22.986Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "AccountsReceivableReport2.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableReport2.cs", + "ViewState": "AgIAAEUAAAAAAAAAAAAQwFUAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-03T08:00:06.831Z" } ] } diff --git a/DDWFHMX.cs b/DDWFHMX.cs index b7e9eab..9b3b9e4 100644 --- a/DDWFHMX.cs +++ b/DDWFHMX.cs @@ -117,8 +117,6 @@ namespace GZ_LTHReportForms.ReporyDDWFH public override List GetSummaryColumnInfo(IRptParams filter) { var result = base.GetSummaryColumnInfo(filter); - //result.Add(new SummaryField("数量", BOSEnums.Enu_SummaryType.SUM)); - //result.Add(new SummaryField("含税单价", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("价税合计", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("已发货数量", BOSEnums.Enu_SummaryType.SUM)); result.Add(new SummaryField("已发货金额", BOSEnums.Enu_SummaryType.SUM)); diff --git a/GZ_LTHReportForms.csproj b/GZ_LTHReportForms.csproj index a0e7c63..a5dc51b 100644 --- a/GZ_LTHReportForms.csproj +++ b/GZ_LTHReportForms.csproj @@ -76,7 +76,6 @@ - diff --git a/JiXiaoKanBan/ResultsKanbanSumReport.cs b/JiXiaoKanBan/ResultsKanbanSumReport.cs index 8ff7969..ded0826 100644 --- a/JiXiaoKanBan/ResultsKanbanSumReport.cs +++ b/JiXiaoKanBan/ResultsKanbanSumReport.cs @@ -81,8 +81,9 @@ namespace GZ_LTHReportForms.JiXiaoKanBan header.AddChild("本年兴诺业绩_万元", new LocaleValue("" + year + "兴诺业绩（万元）"), SqlStorageType.SqlDecimal); header.AddChild("本年武汉派诺_万元", new LocaleValue("" + year + "武汉派诺（万元）"), SqlStorageType.SqlDecimal); header.AddChild("本年碳索业绩_万元", new LocaleValue("" + year + "碳索业绩（万元）"), SqlStorageType.SqlDecimal); - header.AddChild("本年香港派诺业绩_万元", new LocaleValue("" + year + "香港派诺业绩（万元）"), SqlStorageType.SqlDecimal); + header.AddChild("本年香港派诺业绩_万元", new LocaleValue("" + year + "香港派诺业绩（万元）"), SqlStorageType.SqlDecimal); header.AddChild("本年华夏云联业绩_万元", new LocaleValue("" + year + "华夏云联业绩（万元）"), SqlStorageType.SqlDecimal); + header.AddChild("本年诺瓦数能业绩_万元", new LocaleValue("" + year + "诺瓦数能业绩（万元）"), SqlStorageType.SqlDecimal); header.AddChild("往年订单变更金额_万元", new LocaleValue("往年订单变更金额（万元）"), SqlStorageType.SqlDecimal); header.AddChild("本年业绩合计_万元", new LocaleValue("" + year + "合计业绩额（万元）"), SqlStorageType.SqlDecimal); header.AddChild("达标率", new LocaleValue("达标率"), SqlStorageType.Sqlvarchar); diff --git a/YSKDZGongNeng_JY/LiteVersionPlugIn.cs b/YSKDZGongNeng_JY/LiteVersionPlugIn.cs index 04e19cd..9d22e0e 100644 --- a/YSKDZGongNeng_JY/LiteVersionPlugIn.cs +++ b/YSKDZGongNeng_JY/LiteVersionPlugIn.cs @@ -32,7 +32,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable // 判断 应收对账单【明细版】按钮 if (e.BarItemKey == "Test_Button_1") { - string FPath = "应收账款对账单【明细版】.xlsx"; + string FPath = "应收账款对账单【简易版】.xlsx"; // 在临时文件目录，生成一个完整的文件名: C:\Program Files\Kingdee\K3Cloud\WebSite\...\JD.xls string filePath = PathUtils.GetPhysicalPath(KeyConst.TEMPFILEPATH, Path.GetFileName(FPath)); @@ -57,7 +57,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable //单据体 var list = reportModel.DataSource.Rows; - string sqlTest = string.Format(@"/*dialect*/Select FAmount,FDate From MBBA_t_Cust100006 Where Month(FDATE) = Month(DATEADD(MONTH, -1, '{0}'))", fDate); + string sqlTest = string.Format(@"/*dialect*/SELECT * FROM YingShouZhanKuanJY_GZTH"); var sqlTestList = DBUtils.ExecuteDynamicObject(Context, sqlTest); @@ -67,8 +67,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivable if (sqlTestList.Count() > 0) { Num = 1; - fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["FAmount"]), 2); - fDate2 = sqlTestList[0]["FDate"].ToString().Split(' ')[0]; + fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["OrderFAmount"]), 2); + fDate2 = sqlTestList[0]["Date"].ToString().Split(' ')[0]; } Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, Context); diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs index 9017d5b..9f9701a 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs @@ -71,7 +71,15 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("CONTRACTNUMBER", new LocaleValue("订单号"), SqlStorageType.Sqlvarchar); header.AddChild("ProjectName", new LocaleValue("项目名称"), SqlStorageType.Sqlvarchar); header.AddChild("OrderAmount", new LocaleValue("订单金额"), SqlStorageType.SqlDecimal); + header.AddChild("K3发货数量", new LocaleValue("K3发货数量"), SqlStorageType.SqlDecimal); + header.AddChild("K3发货金额", new LocaleValue("K3发货金额"), SqlStorageType.SqlDecimal); + header.AddChild("星空发货数量", new LocaleValue("星空发货数量"), SqlStorageType.SqlDecimal); + header.AddChild("星空发货金额", new LocaleValue("星空发货金额"), SqlStorageType.SqlDecimal); header.AddChild("ShipmentsAmount", new LocaleValue("发货金额"), SqlStorageType.SqlDecimal); + header.AddChild("K3退货数量", new LocaleValue("K3退货数量"), SqlStorageType.SqlDecimal); + header.AddChild("K3退货金额", new LocaleValue("K3退货金额"), SqlStorageType.SqlDecimal); + header.AddChild("星空退货数量", new LocaleValue("星空退货数量"), SqlStorageType.SqlDecimal); + header.AddChild("星空退货金额", new LocaleValue("星空退货金额"), SqlStorageType.SqlDecimal); header.AddChild("FBillAllAmount", new LocaleValue("退货金额"), SqlStorageType.SqlDecimal); header.AddChild("PPBillingDate", new LocaleValue("普票开票时间"), SqlStorageType.Sqlvarchar); header.AddChild("PPFALLAmountFor", new LocaleValue("普票开票金额"), SqlStorageType.SqlDecimal); @@ -83,6 +91,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("InvoicedDebt", new LocaleValue("已开票欠款"), SqlStorageType.SqlDecimal); header.AddChild("OwedTickets", new LocaleValue("欠票"), SqlStorageType.SqlDecimal); header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar); + header.AddChild("FSalerId", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar); header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar); foreach (var item in header.GetChilds()) @@ -133,33 +142,46 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements string sql = string.Format(@"/*dialect*/ --更新MX表中的字段 - EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}' + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}' --更新MX表中的发票金额 EXEC GXFPJEYSDZDMX_GZTH --更新JY表 EXEC UpdateYSDZBJY_GZTH + ", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH); - SELECT - ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID, - * - INTO {4} - FROM YingShouZhanKuanJY_GZTH - WHERE 1=1 - ", FSDate, fDate, ZZFID, fClient, tableName); - - if (!string.IsNullOrEmpty(XSYFID)) - { - sql += string.Format(@"AND FSalerId = '{0}'",XSYFID); - } + sql += string.Format(@" + INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount, + FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets) + Select + '合计', + SUM(OrderAmount) as OrderAmount, + SUM(ShipmentsAmount) as ShipmentsAmount, + SUM(FBillAllAmount) as FBillAllAmount, + SUM(FALLAMOUNTFOR) as FALLAMOUNTFOR, + SUM(PaymentAmount) as PaymentAmount, + SUM(ShippedDebt) as ShippedDebt, + SUM(InvoicedDebt) as InvoicedDebt, + SUM(OwedTickets) as OwedTickets + From YingShouZhanKuanJY_GZTH + where 1=1 + "); if (fGROUP == "2") { sql += string.Format(@"AND IsEnded = '未完结'"); } - if (!string.IsNullOrEmpty(ZZHTH)) + sql += string.Format(@" + SELECT + ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID, + * + INTO {0} + FROM YingShouZhanKuanJY_GZTH + WHERE 1=1 + ",tableName); + if (fGROUP == "2") { - sql += string.Format(@"AND ContractNumber = '{0}'", ZZHTH); + sql += string.Format(@"AND IsEnded = '未完结'"); } DBUtils.Execute(this.Context, sql); } @@ -219,20 +241,21 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements } //设计报表合计列 - public override List GetSummaryColumnInfo(IRptParams filter) - { + //public override List GetSummaryColumnInfo(IRptParams filter) + //{ - var result = base.GetSummaryColumnInfo(filter); - result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("FBillAllAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("PPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ZPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("FALLAMOUNTFOR", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ShippedDebt", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("InvoicedDebt", BOSEnums.Enu_SummaryType.SUM)); - return result; - } + // var result = base.GetSummaryColumnInfo(filter); + // result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("FBillAllAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("PPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ZPFALLAmountFor", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("FALLAMOUNTFOR", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ShippedDebt", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("InvoicedDebt", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("OwedTickets", BOSEnums.Enu_SummaryType.SUM)); + // return result; + //} } } diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs index 3eaec80..c69d5a8 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs @@ -66,7 +66,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements base.GetReportHeaders(filter); ReportHeader header = new ReportHeader(); - + header.AddChild("Number", new LocaleValue("序号"), SqlStorageType.Sqlvarchar); header.AddChild("DATE", new LocaleValue("签订日期"), SqlStorageType.Sqlvarchar); header.AddChild("CONTRACTNUMBER", new LocaleValue("订单号"), SqlStorageType.Sqlvarchar); header.AddChild("ProjectName", new LocaleValue("项目名称"), SqlStorageType.Sqlvarchar); @@ -76,9 +76,17 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("FAllAmount", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal); header.AddChild("OrderAmount", new LocaleValue("订单金额"), SqlStorageType.SqlDecimal); header.AddChild("ShipmentsDate", new LocaleValue("发货日期"), SqlStorageType.Sqlvarchar); - header.AddChild("ShipmentsNum", new LocaleValue("发货数量"), SqlStorageType.SqlInt); + header.AddChild("K3发货数量", new LocaleValue("K3发货数量"), SqlStorageType.SqlDecimal); + header.AddChild("K3发货金额", new LocaleValue("K3发货金额"), SqlStorageType.SqlDecimal); + header.AddChild("星空发货数量", new LocaleValue("星空发货数量"), SqlStorageType.SqlDecimal); + header.AddChild("星空发货金额", new LocaleValue("星空发货金额"), SqlStorageType.SqlDecimal); + header.AddChild("ShipmentsNum", new LocaleValue("发货数量"), SqlStorageType.SqlDecimal); header.AddChild("ShipmentsAmount", new LocaleValue("发货金额"), SqlStorageType.SqlDecimal); header.AddChild("ReturnDate", new LocaleValue("退货日期"), SqlStorageType.Sqlvarchar); + header.AddChild("K3退货数量", new LocaleValue("K3退货数量"), SqlStorageType.SqlDecimal); + header.AddChild("K3退货金额", new LocaleValue("K3退货金额"), SqlStorageType.SqlDecimal); + header.AddChild("星空退货数量", new LocaleValue("星空退货数量"), SqlStorageType.SqlDecimal); + header.AddChild("星空退货金额", new LocaleValue("星空退货金额"), SqlStorageType.SqlDecimal); header.AddChild("ReturnNum", new LocaleValue("退货数量"), SqlStorageType.SqlInt); header.AddChild("ReturnAmount", new LocaleValue("退货金额"), SqlStorageType.SqlDecimal); header.AddChild("PPBillingDate", new LocaleValue("普票开票日期"), SqlStorageType.Sqlvarchar); @@ -92,6 +100,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("InvoicedDebt", new LocaleValue("已开票欠款"), SqlStorageType.SqlDecimal); header.AddChild("OwedTickets", new LocaleValue("欠票"), SqlStorageType.SqlDecimal); header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar); + header.AddChild("FSalerId", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar); header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar); foreach (var item in header.GetChilds()) @@ -143,29 +152,50 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements string sql = string.Format(@"/*dialect*/ --更新表中的字段 - EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}' + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}' --更新表中的发票金额 EXEC GXFPJEYSDZDMX_GZTH - SELECT - ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID, - * - INTO {4} - FROM YingShouZhanKuanMX_GZTH - WHERE 1=1 - ", FSDate,fDate,ZZFID,fClient,tableName); - if (!string.IsNullOrEmpty(XSYFID)) - { - sql += string.Format("AND FSalerId = '{0}'",XSYFID); - } - if(fGROUP == "2") + + ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH); + sql += string.Format(@"/*dialect*/ + INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FTAXPRICE,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount, + ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets) + SELECT + '合计', + SUM(FQTY), + SUM(FTAXPRICE), + SUM(FALLAMOUNT), + SUM(OrderAmount), + SUM(ShipmentsNum), + SUM(ShipmentsAmount), + SUM(ReturnNum), + SUM(ReturnAmount), + SUM(BillingAmount), + SUM(PaymentAmount), + SUM(ShippedDebt), + SUM(InvoicedDebt), + SUM(OwedTickets) + FROM + YingShouZhanKuanMX_GZTH + where 1=1 + "); + if (fGROUP == "2") { sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')"); } - if (!string.IsNullOrEmpty(ZZHTH)) + sql += string.Format(@" + SELECT + ROW_NUMBER() OVER (ORDER BY [FID]) AS FIDENTITYID, + * + INTO {0} + FROM YingShouZhanKuanMX_GZTH + WHERE 1=1 + ",tableName); + if (fGROUP == "2") { - sql += string.Format(@"AND ContractNumber = '{0}'", ZZHTH); + sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')"); } DBUtils.Execute(this.Context, sql); } @@ -224,22 +254,23 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements return reportTitles; } //设计报表合计列 - public override List GetSummaryColumnInfo(IRptParams filter) - { + //public override List GetSummaryColumnInfo(IRptParams filter) + //{ - var result = base.GetSummaryColumnInfo(filter); - result.Add(new SummaryField("FQty", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("FAllAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ShipmentsNum", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ReturnNum", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ReturnAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("PPBillingAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("ZPBillingAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("BillingAmount", BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM)); - return result; - } + // var result = base.GetSummaryColumnInfo(filter); + // result.Add(new SummaryField("FQty", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("FAllAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("OrderAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ShipmentsNum", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ShipmentsAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ReturnNum", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ReturnAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("PPBillingAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("ZPBillingAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("BillingAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("PaymentAmount", BOSEnums.Enu_SummaryType.SUM)); + // result.Add(new SummaryField("OwedTickets", BOSEnums.Enu_SummaryType.SUM)); + // return result; + //} } } diff --git a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs index d27781d..f7b4b61 100644 --- a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs +++ b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs @@ -59,7 +59,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable //单据体 var list = reportModel.DataSource.Rows; - string sqlTest = string.Format(@"/*dialect*/Select FAmount,FDate From MBBA_t_Cust100006 Where Month(FDATE) = Month(DATEADD(MONTH, -1, '{0}'))", fDate); + string sqlTest = string.Format(@"/*dialect*/SELECT * FROM YingShouZhanKuanMX_GZTH"); var sqlTestList = DBUtils.ExecuteDynamicObject(Context, sqlTest); @@ -69,8 +69,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivable if (sqlTestList.Count() > 0) { Num = 1; - fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["FAmount"]),2); - fDate2 = sqlTestList[0]["FDate"].ToString().Split(' ')[0]; + fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["OrderAmount"]),2); + fDate2 = sqlTestList[0]["Date"].ToString().Split(' ')[0]; } Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, Context); @@ -524,10 +524,17 @@ namespace Pilot.Report.Exploitation.AccountsReceivable int lastCol = 5; // 合并到第三列（0-based index） int lastCol2 = 9; // 合并到第三列（0-based index） int lastCol3 = 3; // 合并到第三列（0-based index） + // 创建CellRangeAddress对象 CellRangeAddress cellRangeAddress = new CellRangeAddress(firstRow, lastRow, firstCol, lastCol); CellRangeAddress cellRangeAddress2 = new CellRangeAddress(firstRow, lastRow, firstCol2, lastCol2); CellRangeAddress cellRangeAddress3 = new CellRangeAddress(firstRow, lastRow, firstCol3, lastCol3); + + // 检查并移除重叠的合并区域 + RemoveOverlappingMergedRegions(sheet, cellRangeAddress); + RemoveOverlappingMergedRegions(sheet, cellRangeAddress2); + RemoveOverlappingMergedRegions(sheet, cellRangeAddress3); + // 合并单元格 sheet.AddMergedRegion(cellRangeAddress); sheet.AddMergedRegion(cellRangeAddress2); @@ -551,6 +558,18 @@ namespace Pilot.Report.Exploitation.AccountsReceivable } + private static void RemoveOverlappingMergedRegions(ISheet sheet, CellRangeAddress newRegion) + { + for (int i = sheet.NumMergedRegions - 1; i >= 0; i--) + { + CellRangeAddress existingRegion = sheet.GetMergedRegion(i); + if (existingRegion.Intersects(newRegion)) + { + sheet.RemoveMergedRegion(i); + } + } + } + public static string ToChineseNumber(decimal number, Kingdee.BOS.Context Context) { //Select top 1 dbo.ConvertAmountToChineseWords(12345.14) as 'PriceText' From T_SAL_ORDER diff --git a/YingShouBaoBiao/YingShouHTXZ.cs b/YingShouBaoBiao/YingShouHTXZ.cs index c612f2e..1ab27ef 100644 --- a/YingShouBaoBiao/YingShouHTXZ.cs +++ b/YingShouBaoBiao/YingShouHTXZ.cs @@ -31,61 +31,6 @@ namespace GZ_LTHReportForms.YingShouBaoBiao //设置是否分组汇总 this.ReportProperty.IsGroupSummary = true; } - //获取过滤条件信息(构造单据信息) - public override ReportTitles GetReportTitles(IRptParams filter) - { - //创建标题对象 - ReportTitles reportTitles = new ReportTitles(); - //获取自定义过滤条件 - DynamicObject customFilter = filter.FilterParameter.CustomFilter; - if (customFilter != null) - { - //获取组织名称 - string multiOrgnNameValues = this.GetMultiOrgnNameValues(customFilter["F_YKQC_OrgId_qtr"] as DynamicObject); - //添加标题 - reportTitles.AddTitle("F_YKQC_OrgId_qtr", multiOrgnNameValues); - } - //返回标题 - return reportTitles; - } - //获取组织名称 - private string GetMultiOrgnNameValues(DynamicObject orgIdStrings) - { - //获取组织名称 - List list = new List(); - //初始化结果字符串 - string result = string.Empty; - //如果组织ID字符串不为空 - if (orgIdStrings != null) - { - //获取查询服务 - IQueryService service = Kingdee.BOS.Contracts.ServiceFactory.GetService(base.Context); - //创建查询参数 - QueryBuilderParemeter para = new QueryBuilderParemeter - { - FormId = "ORG_Organizations", - //查询组织名称 - SelectItems = SelectorItemInfo.CreateItems("FNAME"), - //过滤条件，根据组织ID和区域ID - FilterClauseWihtKey = string.Format("FORGID IN ({0}) AND FLOCALEID = {1}", orgIdStrings["Id"].Long2Int(), base.Context.UserLocale.LCID) - }; - //获取动态对象集合 - DynamicObjectCollection dynamicObjects = service.GetDynamicObjectCollection(base.Context, para, null); - //遍历获取到的动态对象 - foreach (DynamicObject current in dynamicObjects) - { - //将组织名称添加到列表 - list.Add(current["FNAME"].ToString()); - } - //如果列表不为空 - if (list.Count > 0) - { - result = string.Join(",", list.ToArray()); - } - } - //返回组织名称字符串 - return result; - } //设置单据列 public override ReportHeader GetReportHeaders(IRptParams filter) { @@ -119,263 +64,30 @@ namespace GZ_LTHReportForms.YingShouBaoBiao //创建临时表 public override void BuilderReportSqlAndTempTable(IRptParams filter, string tableName) { - //获取过滤条件 - string Filter = GetFilterWhere(filter); + base.BuilderReportSqlAndTempTable(filter, tableName); + DynamicObject customFilter = filter.FilterParameter.CustomFilter; + //组织 + var ZZ = (customFilter["F_YKQC_OrgId_uky"] as DynamicObject); + var ZZFID = string.Empty; + if (ZZ != null) + { + ZZFID = ZZ["Id"]?.ToString(); + } + //结束日期 + string FEndDate = (customFilter["F_EDate"] == null) ? string.Empty : Convert.ToDateTime( + customFilter["F_EDate"]).ToString("yyyy-MM-dd"); string sql = string.Format(@"/*dialect*/ -DECLARE @ThisDate VARCHAR(1000); -DECLARE @ResultDate VARCHAR(1000); --- 取上一年的年底日期 -SET @ResultDate = FORMAT(DATEADD(DAY, -1, DATEADD(YEAR, DATEDIFF(YEAR, 0, GETDATE()), 0)),'yyyy-MM-dd'); ---取当前日期 -SET @ThisDate = FORMAT(GETDATE(),'yyyy-MM-dd') - -SELECT W.*,x.FNAME into #RecCond FROM T_SAL_ORDERPLAN W -INNER JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId - -SELECT D.FID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT' - INTO #SAL - FROM T_SAL_DELIVERYNOTICE A - INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID - INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F E ON E.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY D.FID - - - SELECT D.FID,sum(b.fqty) AS 'FQTY',sum(E.fallamount) AS 'FAMOUNT' - INTO #RETURN - FROM T_SAL_RETURNNOTICE A - INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID - INNER JOIN T_SAL_RETURNNOTICEENTRY_F E ON E.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON C.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_ORDERENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY D.FID - - - SELECT F.FID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' - INTO #OUTSTOCK - FROM T_SAL_OUTSTOCK A - INNER JOIN T_SAL_OUTSTOCKENTRY B ON A.FID = B.FID - INNER JOIN T_SAL_OUTSTOCKENTRY_F G ON G.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_OUTSTOCKENTRY_LK C ON C.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_DELIVERYNOTICEENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID - INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID - INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY F.FID - - SELECT F.FID,sum(b.FREALQTY) AS 'FQTY',sum(G.FALLAMOUNT_LC) AS 'FAMOUNT' - INTO #RETURNSTOCK - FROM T_SAL_RETURNSTOCK A - INNER JOIN T_SAL_RETURNSTOCKENTRY B ON A.FID = B.FID - INNER JOIN T_SAL_RETURNSTOCKENTRY_F G ON G.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_RETURNSTOCKENTRY_LK C ON C.FENTRYID = B.FENTRYID - INNER JOIN T_SAL_RETURNNOTICEENTRY D ON D.FID = C.FSBILLID AND D.FENTRYID = C.FSID - INNER JOIN T_SAL_RETURNNOTICEENTRY_LK E ON E.FENTRYID = D.FENTRYID - INNER JOIN T_SAL_ORDERENTRY F ON F.FID = E.FSBILLID AND F.FENTRYID = E.FSID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY F.FID - - SELECT b.FORDERENTRYID as 'FENTRYID',sum(b.FPriceQty) AS 'FQTY',sum(b.FALLAMOUNT) AS 'FAMOUNT' - INTO #RECE - FROM t_AR_receivable A - INNER JOIN t_AR_receivableENTRY B ON A.FID = B.FID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY b.FORDERENTRYID - - -SELECT -S.FCAPTION AS '合同性质', -CASE WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ <> '' then '项目已做完，回部分款' - WHEN S.FCAPTION = '仪表' AND a.F_XMYSSJ = '' then '项目未完工，欠款合同' - WHEN S.FCAPTION <> '仪表' AND y.FID is not null then '款到发货' - WHEN S.FCAPTION <> '仪表' AND z.FID is not null then '协议付款' - ELSE '预收款+到货/调试款+质保金' END AS '结算类型', -0 AS '期初已出货欠款汇总', -CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.Fid,n.FSaleId,X.FNAME ORDER BY n.FSaleId,X.FNAME) != 1 THEN null - WHEN X.FNAME in ('预付款(仪表)','预付款(系统)') THEN null - WHEN X.FNAME in ('货到收款(仪表)','货到收款(系统)') AND DATEADD(day, W.F_DAY, CK.F_SFSIGNATURETIME) < @ResultDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('货到收款(仪表)','货到收款(系统)') AND DATEADD(day, W.F_DAY, CK.F_SFSIGNATURETIME) < @ResultDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - WHEN X.FNAME in ('货到票到收款(系统)','货到票到收款(仪表)') AND DATEADD(day, W.F_DAY,FP.F_DATE) < @ResultDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('货到票到收款(系统)','货到票到收款(仪表)') AND DATEADD(day, W.F_DAY,FP.F_DATE) < @ResultDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - WHEN X.FNAME in ('款到发货(仪表)','款到发货(系统)') AND DATEADD(day, W.F_DAY,Q.发货日期) < @ResultDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('款到发货(仪表)','款到发货(系统)') AND DATEADD(day, W.F_DAY,Q.发货日期) < @ResultDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - ELSE null--款到发货(仪表) - END AS '期初已到期欠款', -0 AS '本月已出货欠款汇总', -CASE WHEN ROW_NUMBER() OVER (PARTITION BY A.Fid,n.FSaleId,X.FNAME ORDER BY n.FSaleId,X.FNAME) != 1 THEN null - WHEN X.FNAME in ('预付款(仪表)','预付款(系统)') THEN null - WHEN X.FNAME in ('货到收款(仪表)','货到收款(系统)') AND DATEADD(day, W.F_DAY, CK.F_SFSIGNATURETIME) < @ThisDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('货到收款(仪表)','货到收款(系统)') AND DATEADD(day, W.F_DAY, CK.F_SFSIGNATURETIME) < @ThisDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - WHEN X.FNAME in ('货到票到收款(系统)','货到票到收款(仪表)') AND DATEADD(day, W.F_DAY,FP.F_DATE) < @ThisDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('货到票到收款(系统)','货到票到收款(仪表)') AND DATEADD(day, W.F_DAY,FP.F_DATE) < @ThisDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - WHEN X.FNAME in ('款到发货(仪表)','款到发货(系统)') AND DATEADD(day, W.F_DAY,Q.发货日期) < @ThisDate AND W.FRECADVANCERATE = 100 THEN ISNULL(Q.累计发货金额,0)-ISNULL(v.累计退货金额,0) - WHEN X.FNAME in ('款到发货(仪表)','款到发货(系统)') AND DATEADD(day, W.F_DAY,Q.发货日期) < @ThisDate THEN ISNULL(W.F_MBBA_Decimal_uky,0) - ELSE null--款到发货(仪表) - END AS '本月已到期欠款' -INTO #TEMP1 -FROM T_SAL_ORDER A --销售订单表头 - 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 - --INNER JOIN T_SAL_orderentry b on a.FID = B.FID --销售订单表体 - INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 --客户附属表 - INNER JOIN T_SAL_ORDERFIN F ON F.FID = A.FID - INNER JOIN T_BD_CUSTOMER I ON I .FCUSTID = A.FCUSTID - INNER JOIN T_SAL_ORDERFIN J ON J.FID= A.FID - LEFT JOIN T_BAS_PREBDONE_L G ON G.FID = A.F_projectname AND G.FLocaleID =2052 - LEFT JOIN T_BAS_PREBDTHREE H ON H.FID = A.F_BON - lEFT JOIN V_ASSISTANTDATA K ON K.FENTRYID = I.FCompanyNature - lEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID - left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO - left JOIN T_PerformanceSharingEntry N ON N.FID=M.FID - LEFT JOIN V_BD_SALESMAN_L O ON O.fid= N.FSALEID - LEFT JOIN V_ASSISTANTDATA P ON P.FENTRYID = I.F_CREDITCLASSIFICATION - LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = A.F_CONTRACTNUMBER --销售出库单 - LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = A.F_CONTRACTNUMBER --销售增值税专用发票 - LEFT JOIN - ( - SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), A.FDATE,23)) AS '发货日期',SUM(B.FBILLALLAMOUNT_LC) AS '累计发货金额' FROM T_SAL_DELIVERYNOTICE A - INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON A.FID =B.FID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY A.F_Papercontract - ) Q ON Q.F_PAPERCONTRACT = A.F_contractnumber --获取发货通知单最大的发货日期 - LEFT JOIN T_META_FORMENUMITEM R ON r.FVALUE = A.F_OrderType AND R.FID = 'bc2c1d77-0f4b-41d2-b61b-e29554c570d4' - LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.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_contractnumber,MAX(CONVERT(NVARCHAR(10), A.FDATE,23)) AS '退货日期',SUM(B.FBILLALLAMOUNT_LC) AS '累计退货金额' FROM T_SAL_RETURNSTOCK A - INNER JOIN T_SAL_RETURNSTOCKFIN B ON A.FID =B.FID - WHERE A.FDOCUMENTSTATUS= 'C' - GROUP BY A.F_contractnumber - ) V ON V.F_contractnumber = A.F_contractnumber --获取销售退货单 - LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo AC ON AC.名称=L.FNAME - LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACC ON ACC.名称=O.FNAME - --LEFT JOIN temp20241206 AC ON AC.名称=L.FNAME - --LEFT JOIN temp20241206 ACC ON ACC.名称=O.FNAME - LEFT JOIN T_SAL_ORDERPLAN W ON W.FID= A.FID - LEFT JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId - LEFT JOIN #RecCond Y ON Y.FID =A.FID AND Y.FNAME LIKE '%质保金%' - LEFT JOIN (select distinct fid from #RecCond Z where Z.FNAME LIKE '%款到%') z on z.fid =a.fid - LEFT JOIN (select distinct fid from #RecCond AA where AA.FNAME LIKE '%协议%') AA on AA.fid =a.fid - LEFT JOIN (SELECT distinct F_Papercontract FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='是') AB ON AB.F_PAPERCONTRACT = A.F_contractnumber - LEFT JOIN - ( - SELECT - F_Papercontract,CAST( sum(b.FALLAMOUNT) AS REAL) AS '发票总金额', - CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS REAL) 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, - avg(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 - WHERE 1=1 AND A.FDOCUMENTSTATUS = 'C' AND B.FDATAVALUE != 'Z' - AND ((F.FBILLALLAMOUNT_LC * isnull(n.FSHARERATE,100) /100)!=0) -{1} - ORDER BY A.F_contractnumber - - - - SELECT - 合同性质 AS 合同性质2, - 结算类型 AS 结算类型2, - CONVERT(DECIMAL(10, 2),SUM(ISNULL(期初已出货欠款汇总, 0)),2) AS '期初已出货欠款汇总2', - CONVERT(DECIMAL(10, 2),SUM(ISNULL(期初已到期欠款, 0)),2) AS '期初已到期欠款2', - CONVERT(DECIMAL(10, 2),SUM(ISNULL(本月已出货欠款汇总, 0)),2) AS '本月已出货欠款汇总2', - CONVERT(DECIMAL(10, 2),SUM(ISNULL(本月已到期欠款, 0)),2) AS '本月已到期欠款2', - 0 AS '已出货欠款汇总', - 0 AS '已到期欠款' - INTO #TEMP2 -FROM - #TEMP1 -GROUP BY - 结算类型,合同性质 -ORDER BY - 结算类型,合同性质 DESC; - -ALTER TABLE #TEMP2 ALTER COLUMN 已出货欠款汇总 NUMERIC(10, 2); - -ALTER TABLE #TEMP2 ALTER COLUMN 已到期欠款 NUMERIC(10, 2); - -update #TEMP2 SET 已出货欠款汇总 = CONVERT(DECIMAL(10, 2),(本月已出货欠款汇总2 - 期初已出货欠款汇总2),2) - -update #TEMP2 SET 已到期欠款 = CONVERT(DECIMAL(10, 2),(本月已到期欠款2 - 期初已到期欠款2),2) - -SELECT -ROW_NUMBER() OVER (ORDER BY B.合同性质2 DESC) AS FID, -ROW_NUMBER() OVER (ORDER BY B.结算类型2 DESC) AS FIDENTITYID, -B.合同性质2 AS 'FHTXZ', -B.结算类型2 AS 'FJSLX', -CASE -WHEN B.期初已出货欠款汇总2 = 0 THEN null -ELSE B.期初已出货欠款汇总2 END AS '期初已出货欠款汇总', -CASE -WHEN B.期初已到期欠款2 = 0 THEN null -ELSE B.期初已到期欠款2 END AS '期初已到期欠款', -CASE -WHEN B.本月已出货欠款汇总2 = 0 THEN null -ELSE B.本月已出货欠款汇总2 END AS '本月已出货欠款汇总', -CASE -WHEN B.本月已到期欠款2 = 0 THEN null -ELSE B.本月已到期欠款2 END AS '本月已到期欠款', -CASE -WHEN B.已出货欠款汇总 = 0 THEN null -ELSE B.已出货欠款汇总 END AS '已出货欠款汇总', -CASE -WHEN B.已到期欠款 = 0 THEN null -ELSE B.已到期欠款 END AS '已到期欠款' -INTO {0} FROM #TEMP1 A INNER JOIN #TEMP2 B ON A.结算类型 = B.结算类型2 -GROUP BY B.合同性质2 ,B.结算类型2,B.期初已出货欠款汇总2,B.期初已到期欠款2,B.本月已出货欠款汇总2,B.本月已到期欠款2,B.已出货欠款汇总,B.已到期欠款 -ORDER BY FID -", tableName, Filter); + EXEC YSQKGKHTXZ_GZTH '{0}','{1}' + SELECT + ROW_NUMBER() OVER (ORDER BY [FHTXZ] DESC) AS FID, + ROW_NUMBER() OVER (ORDER BY [FHTXZ] DESC) AS FIDENTITYID, + * INTO {2} FROM YinggShouHTXZ_GZTH + ", FEndDate,ZZFID,tableName); //执行SQL并动态创建报表 DBUtils.ExecuteDynamicObject(this.Context, sql); } - //获取过滤条件 - private string GetFilterWhere(IRptParams fileter) - { - //获取自定义过滤条件 - DynamicObject customFilter = fileter.FilterParameter.CustomFilter; - //创建字符串构建器 - StringBuilder strwhere = new StringBuilder(); - var orgFid = customFilter["F_YKQC_OrgId_qtr"] as DynamicObject; - if (orgFid != null) - { - string org = string.IsNullOrWhiteSpace(customFilter["F_YKQC_OrgId_qtr"].ToString()) ? "" : - string.Format("AND A.FSaleOrgId IN ({0})", orgFid["Id"].Long2Int()); - //添加组织过滤条件 - strwhere.AppendLine(org); - } - return strwhere.ToString(); - } //添加合计列 public override List GetSummaryColumnInfo(IRptParams filter) { diff --git a/YingShouBaoBiao/YingShouQDNF.cs b/YingShouBaoBiao/YingShouQDNF.cs index cbe1777..6558d02 100644 --- a/YingShouBaoBiao/YingShouQDNF.cs +++ b/YingShouBaoBiao/YingShouQDNF.cs @@ -33,11 +33,24 @@ namespace GZ_LTHReportForms.YingShouBaoBiao //设置单据列 public override ReportHeader GetReportHeaders(IRptParams filter) { + DynamicObject customFilter = filter.FilterParameter.CustomFilter; + + //当前时间格式化 + string FEndDate = (customFilter["F_EDate"] == null) ? string.Empty : Convert.ToDateTime( + customFilter["F_EDate"]).ToString("yyyy年MM月"); + + //过去时间格式化 + DateTime currentDate = DateTime.Now; + + DateTime lastYearDecember = new DateTime(currentDate.Year - 1, 12, 31); + + string FLastDate = lastYearDecember.ToString("yyyy年MM月"); + //创建表头对象 ReportHeader header = new ReportHeader(); header.AddChild("签订年份", new LocaleValue("签订年份", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); - header.AddChild("年底到期应收款额", new LocaleValue("期初到期应收款额", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); - header.AddChild("到期应收款额", new LocaleValue("本月到期应收款额", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); + header.AddChild("期初到期应收款额", new LocaleValue(FEndDate + "到期应收款额", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); + header.AddChild("本月到期应收款额", new LocaleValue(FLastDate + "到期应收款额", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); header.AddChild("占比", new LocaleValue("占比", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); header.AddChild("变化", new LocaleValue("变化", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); foreach (var item in header.GetChilds()) @@ -51,11 +64,27 @@ namespace GZ_LTHReportForms.YingShouBaoBiao { base.BuilderReportSqlAndTempTable (filter, tableName); + DynamicObject customFilter = filter.FilterParameter.CustomFilter; + //组织 + var ZZ = (customFilter["F_YKQC_OrgId_uky"] as DynamicObject); + var ZZFID = string.Empty; + if (ZZ != null) + { + ZZFID = ZZ["Id"]?.ToString(); + } + + //结束日期 + string FEndDate = (customFilter["F_EDate"] == null) ? string.Empty : Convert.ToDateTime( + customFilter["F_EDate"]).ToString("yyyy-MM-dd"); string sql = string.Format(@"/*dialect*/ - - ", tableName); + EXEC YSQKGKQDNF_GZTH '{0}','{1}' + SELECT + ROW_NUMBER() OVER (ORDER BY [签订年份] DESC) AS FID, + ROW_NUMBER() OVER (ORDER BY [签订年份] DESC) AS FIDENTITYID, + * INTO {2} FROM YSQKGK_QDNF_GZTH + ",FEndDate,ZZFID, tableName); //执行SQL并动态创建报表 DBUtils.ExecuteDynamicObject(this.Context, sql); } @@ -64,8 +93,8 @@ namespace GZ_LTHReportForms.YingShouBaoBiao public override List GetSummaryColumnInfo(IRptParams filter) { var result = base.GetSummaryColumnInfo(filter); - result.Add(new SummaryField("年底到期应收款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); - result.Add(new SummaryField("到期应收款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); + result.Add(new SummaryField("期初到期应收款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); + result.Add(new SummaryField("本月到期应收款额", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM)); return result; } } diff --git a/YingShouBaoBiao/YingShouSBU.cs b/YingShouBaoBiao/YingShouSBU.cs index edd7cb3..aa42ce1 100644 --- a/YingShouBaoBiao/YingShouSBU.cs +++ b/YingShouBaoBiao/YingShouSBU.cs @@ -68,9 +68,13 @@ namespace GZ_LTHReportForms.YingShouBaoBiao base.BuilderReportSqlAndTempTable (filter, tableName); DynamicObject customFilter = filter.FilterParameter.CustomFilter; - //开始日期 - string FStrartDate = (customFilter["F_SDate"] == null) ? string.Empty : Convert.ToDateTime( - customFilter["F_SDate"]).ToString("yyyy-MM-dd"); + //组织 + var ZZ = (customFilter["F_YKQC_OrgId_uky"] as DynamicObject); + var ZZFID = string.Empty; + if (ZZ != null) + { + ZZFID = ZZ["Id"]?.ToString(); + } //结束日期 string FEndDate = (customFilter["F_EDate"] == null) ? string.Empty : Convert.ToDateTime( @@ -82,7 +86,7 @@ namespace GZ_LTHReportForms.YingShouBaoBiao ROW_NUMBER() OVER (ORDER BY SBU DESC) AS FID, ROW_NUMBER() OVER (ORDER BY SBU DESC) AS FIDENTITYID, * INTO {2} FROM YSQKGK_SBU_GZTH - ", FStrartDate,FEndDate,tableName); + ", FEndDate,ZZFID,tableName); //执行SQL并动态创建报表 DBUtils.ExecuteDynamicObject(this.Context, sql); } diff --git a/bin/Debug/GZ_LTHReportForms.dll b/bin/Debug/GZ_LTHReportForms.dll index 778bf26..f001a67 100644 Binary files a/bin/Debug/GZ_LTHReportForms.dll and b/bin/Debug/GZ_LTHReportForms.dll differ diff --git a/bin/Debug/GZ_LTHReportForms.pdb b/bin/Debug/GZ_LTHReportForms.pdb index 09d465e..652063a 100644 Binary files a/bin/Debug/GZ_LTHReportForms.pdb and b/bin/Debug/GZ_LTHReportForms.pdb differ diff --git a/bin/Debug/ICSharpCode.SharpZipLib.dll b/bin/Debug/ICSharpCode.SharpZipLib.dll new file mode 100644 index 0000000..49a1d1a Binary files /dev/null and b/bin/Debug/ICSharpCode.SharpZipLib.dll differ diff --git a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache b/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache index 7e90199..41b8e3f 100644 --- a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache +++ b/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -686098261f14ca6d682b2dce3283523d350bf835e6e98e75b759ab0ba888698e +0a2685ad3f2eb2618df18b0bd8e3416134f97c0f2b82d87b412eba7089ff8d21 diff --git a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt index de8bab3..562eb7d 100644 --- a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt +++ b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt @@ -24,18 +24,10 @@ E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\NPOI.OOXML.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\NPOI.OpenXml4Net.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\NPOI.OpenXmlFormats.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Newtonsoft.Json.dll +E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\ICSharpCode.SharpZipLib.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Oracle.DataAccess.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.csproj.AssemblyReference.cache E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.csproj.CoreCompileInputs.cache E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHRe.A59FB3A8.Up2Date E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.dll E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.pdb -E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\ICSharpCode.SharpZipLib.dll -F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\GZ_LTHReportForms.dll -F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\GZ_LTHReportForms.pdb -F:\珠海项目\派诺项目\报表开发(天华)\bin\Debug\Oracle.DataAccess.dll -F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.csproj.AssemblyReference.cache -F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.csproj.CoreCompileInputs.cache -F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHRe.A59FB3A8.Up2Date -F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.dll -F:\珠海项目\派诺项目\报表开发(天华)\obj\Debug\GZ_LTHReportForms.pdb diff --git a/obj/Debug/GZ_LTHReportForms.dll b/obj/Debug/GZ_LTHReportForms.dll index 778bf26..f001a67 100644 Binary files a/obj/Debug/GZ_LTHReportForms.dll and b/obj/Debug/GZ_LTHReportForms.dll differ diff --git a/obj/Debug/GZ_LTHReportForms.pdb b/obj/Debug/GZ_LTHReportForms.pdb index 09d465e..652063a 100644 Binary files a/obj/Debug/GZ_LTHReportForms.pdb and b/obj/Debug/GZ_LTHReportForms.pdb differ diff --git a/派诺报表SQL文件/应收对账单取发票金额(创建).sql b/派诺报表SQL文件/应收对账单取发票金额(创建).sql index 7169a03..d34c530 100644 --- a/派诺报表SQL文件/应收对账单取发票金额(创建).sql +++ b/派诺报表SQL文件/应收对账单取发票金额(创建).sql @@ -9,7 +9,8 @@ CREATE TABLE FPYSDZDMX ( FPFID DECIMAL(23, 10), FPFENTRYID DECIMAL(23, 10), KPJE DECIMAL(23, 10), - ISTrue DECIMAL(23, 10) + ISTrue DECIMAL(23, 10), + SFPPCCW VARCHAR(500) ); --DROP TABLE FPYSDZDMX diff --git a/派诺报表SQL文件/应收对账表(明细创建SQL).sql b/派诺报表SQL文件/应收对账表(明细创建SQL).sql index 1654fa1..f72d93c 100644 --- a/派诺报表SQL文件/应收对账表(明细创建SQL).sql +++ b/派诺报表SQL文件/应收对账表(明细创建SQL).sql @@ -1,41 +1,47 @@ -CREATE TABLE YingShouZhanKuanMX ( - FID VARCHAR(3000), --۶FID - FENTRYID VARCHAR(3000), --۶FENTRYID - FSaleOrgId VARCHAR(3000),--֯ - FBILLNO VARCHAR(3000), --۶ - FSalerId VARCHAR(3000),--ԱFID - [DATE] varchar(1000), -- ǩ - CONTRACTNUMBER VARCHAR(3000), -- - ProjectName VARCHAR(3000), -- Ŀ - SizeModel VARCHAR(3000), -- ͺ - FQty DECIMAL(23, 10), -- /̨ - FTaxPrice DECIMAL(23, 10), -- - FAllAmount DECIMAL(23, 10), -- ˰ϼ - OrderAmount DECIMAL(23, 10), -- - ShipmentsDate varchar(1000), -- - ShipmentsNum DECIMAL(23, 10), -- - ShipmentsAmount DECIMAL(23, 10), -- - ReturnDate varchar(1000), -- ˻ - ReturnNum DECIMAL(23, 10), -- ˻ - ReturnAmount DECIMAL(23, 10), -- ˻ - ZPBillingDate varchar(1000), -- רƱƱ - QCZPBillingAmount DECIMAL(23, 10), --ڳרƱ - ZPBillingAmount DECIMAL(23, 10), -- רƱƱ - PPBillingDate varchar(1000), --ƱƱ - QCPPBillingAmount DECIMAL(23, 10), --ڳƱ - PPBillingAmount DECIMAL(23, 10), -- ƱƱ - BillingAmount DECIMAL(23, 10), -- Ʊ - PaymentDate varchar(1000), -- ؿ - PaymentAmount DECIMAL(23, 10), -- ؿ - ShippedDebt DECIMAL(23, 10), -- ѳǷ - InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ - OwedTickets DECIMAL(23, 10), -- ǷƱ - IsEnded VARCHAR(3000), -- Ƿ - Remark VARCHAR(3000) -- ע -); +--CREATE TABLE YingShouZhanKuanMX ( +-- NUMBER VARCHAR(3000), +-- FID VARCHAR(3000), --۶FID +-- FENTRYID VARCHAR(3000), --۶FENTRYID +-- FSaleOrgId VARCHAR(3000),--֯ +-- FBILLNO VARCHAR(3000), --۶ +-- FSalerId VARCHAR(3000),--ԱFID +-- [DATE] varchar(1000), -- ǩ +-- CONTRACTNUMBER VARCHAR(3000), -- +-- ProjectName VARCHAR(3000), -- Ŀ +-- SizeModel VARCHAR(3000), -- ͺ +-- FQty DECIMAL(23, 10), -- /̨ +-- FTaxPrice DECIMAL(23, 10), -- +-- FAllAmount DECIMAL(23, 10), -- ˰ϼ +-- OrderAmount DECIMAL(23, 10), -- +-- ShipmentsDate varchar(1000), -- +-- ShipmentsNum DECIMAL(23, 10), -- +-- ShipmentsAmount DECIMAL(23, 10), -- +-- ReturnDate varchar(1000), -- ˻ +-- ReturnNum DECIMAL(23, 10), -- ˻ +-- ReturnAmount DECIMAL(23, 10), -- ˻ +-- ZPBillingDate varchar(1000), -- רƱƱ +-- QCZPBillingAmount DECIMAL(23, 10), --ڳרƱ +-- ZPBillingAmount DECIMAL(23, 10), -- רƱƱ +-- PPBillingDate varchar(1000), --ƱƱ +-- QCPPBillingAmount DECIMAL(23, 10), --ڳƱ +-- PPBillingAmount DECIMAL(23, 10), -- ƱƱ +-- BillingAmount DECIMAL(23, 10), -- Ʊ +-- PaymentDate varchar(1000), -- ؿ +-- PaymentAmount DECIMAL(23, 10), -- ؿ +-- ShippedDebt DECIMAL(23, 10), -- ѳǷ +-- InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ +-- OwedTickets DECIMAL(23, 10), -- ǷƱ +-- IsEnded VARCHAR(3000), -- Ƿ +-- Remark VARCHAR(3000), -- ע +-- K3 DECIMAL(23, 10), +-- K3 DECIMAL(23, 10), +-- SFPPCCW VARCHAR(3000), --ǷƱ + +--); CREATE TABLE YingShouZhanKuanMX_GZTH ( + NUMBER VARCHAR(3000), FID VARCHAR(3000), --۶FID FENTRYID VARCHAR(3000), --۶FENTRYID FSaleOrgId VARCHAR(3000),--֯ @@ -69,7 +75,16 @@ CREATE TABLE YingShouZhanKuanMX_GZTH ( OwedTickets DECIMAL(23, 10), -- ǷƱ IsEnded VARCHAR(3000), -- Ƿ Remark VARCHAR(3000), -- ע - row_num DECIMAL(23, 10) --ֶ + SFPPCCW VARCHAR(3000), --ǷƱ + ǿշ DECIMAL(23, 10), + ǿշ DECIMAL(23, 10), + ǿ˻ DECIMAL(23, 10), + ǿ˻ DECIMAL(23, 10), + K3 DECIMAL(23, 10), + K3 DECIMAL(23, 10), + K3˻ DECIMAL(23, 10), + K3˻ DECIMAL(23, 10), + row_num DECIMAL(23, 10), --ֶ ); diff --git a/派诺报表SQL文件/应收对账表(简易创建).sql b/派诺报表SQL文件/应收对账表(简易创建).sql index 2ad7c08..d3fb1d8 100644 --- a/派诺报表SQL文件/应收对账表(简易创建).sql +++ b/派诺报表SQL文件/应收对账表(简易创建).sql @@ -1,25 +1,25 @@ -CREATE TABLE YingShouZhanKuanJY( - FID VARCHAR(3000), --۶FID - FSaleOrgId VARCHAR(3000),--֯ - FSalerId VARCHAR(3000),--ԱFID - [DATE] VARCHAR(2000), -- ǩ - ContractNumber VARCHAR(2000), -- - ProjectName VARCHAR(2000), -- Ŀ - OrderAmount DECIMAL(23, 10), -- - ShipmentsAmount DECIMAL(23, 10), -- - FBillAllAmount DECIMAL(23, 10), -- ˻ - PPBillingDate VARCHAR(2000), --ƱƱʱ - PPFALLAmountFor DECIMAL(23, 10), -- ƱƱ - ZPBillingDate VARCHAR(2000), --רƱƱʱ - ZPFALLAmountFor DECIMAL(23, 10), -- רƱƱ - FALLAmountFor DECIMAL(23, 10), -- Ʊ - PaymentAmount DECIMAL(23, 10), -- ؿ - ShippedDebt DECIMAL(23, 10), -- ѳǷ - InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ - OwedTickets VARCHAR(2000), -- ǷƱ - IsEnded VARCHAR(2000), -- Ƿ - Remark VARCHAR(2000) -- ע -); +--CREATE TABLE YingShouZhanKuanJY( +-- FID VARCHAR(3000), --۶FID +-- FSaleOrgId VARCHAR(3000),--֯ +-- FSalerId VARCHAR(3000),--ԱFID +-- [DATE] VARCHAR(2000), -- ǩ +-- ContractNumber VARCHAR(2000), -- +-- ProjectName VARCHAR(2000), -- Ŀ +-- OrderAmount DECIMAL(23, 10), -- +-- ShipmentsAmount DECIMAL(23, 10), -- +-- FBillAllAmount DECIMAL(23, 10), -- ˻ +-- PPBillingDate VARCHAR(2000), --ƱƱʱ +-- PPFALLAmountFor DECIMAL(23, 10), -- ƱƱ +-- ZPBillingDate VARCHAR(2000), --רƱƱʱ +-- ZPFALLAmountFor DECIMAL(23, 10), -- רƱƱ +-- FALLAmountFor DECIMAL(23, 10), -- Ʊ +-- PaymentAmount DECIMAL(23, 10), -- ؿ +-- ShippedDebt DECIMAL(23, 10), -- ѳǷ +-- InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ +-- OwedTickets VARCHAR(2000), -- ǷƱ +-- IsEnded VARCHAR(2000), -- Ƿ +-- Remark VARCHAR(2000) -- ע +--); CREATE TABLE YingShouZhanKuanJY_GZTH( Number VARCHAR(3000), @@ -40,11 +40,19 @@ CREATE TABLE YingShouZhanKuanJY_GZTH( PaymentAmount DECIMAL(23, 10), -- ؿ ShippedDebt DECIMAL(23, 10), -- ѳǷ InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ - OwedTickets VARCHAR(2000), -- ǷƱ + OwedTickets DECIMAL(23, 10), -- ǷƱ IsEnded VARCHAR(2000), -- Ƿ Remark VARCHAR(2000), -- ע + ǿշ DECIMAL(23, 10), + ǿշ DECIMAL(23, 10), + ǿ˻ DECIMAL(23, 10), + ǿ˻ DECIMAL(23, 10), + K3 DECIMAL(23, 10), + K3 DECIMAL(23, 10), + K3˻ DECIMAL(23, 10), + K3˻ DECIMAL(23, 10), row_num DECIMAL(23, 10) --ֶ ); --DROP TABLE YingShouZhanKuanJY; ---DROP TABLE YingShouZhanKuanJY_GZTH; \ No newline at end of file +--DROP TABLE YingShouZhanKuanJY_GZTH; diff --git a/派诺报表SQL文件/应收情况概况表按SBU区分插入数据SQL.sql b/派诺报表SQL文件/应收情况概况表按SBU区分插入数据SQL.sql index 3d9c66f..c4cdd0e 100644 --- a/派诺报表SQL文件/应收情况概况表按SBU区分插入数据SQL.sql +++ b/派诺报表SQL文件/应收情况概况表按SBU区分插入数据SQL.sql @@ -1,100 +1,71 @@ -CREATE PROCEDURE YSQKGKSBU_GZTH +ALTER PROCEDURE YSQKGKSBU_GZTH @FSDate NVARCHAR(100), @FEDate NVARCHAR(100) AS BEGIN - DECLARE @SumDQJE DECIMAL(23,10) + -- + DECLARE @StartDate DATE; + DECLARE @EndDate DATE; + DECLARE @LastDate Date; - -- - DECLARE @FEDateDate DATE; + -- ַתΪ + SET @StartDate = CONVERT(DATE, @FSDate, 120); -- ڸʽΪ YYYY-MM-DD + SET @EndDate = CONVERT(DATE, @FEDate, 120); -- ڸʽΪ YYYY-MM-DD - --ж@FEDateǷΪ - IF @FEDate IS NULL OR @FEDate = '' - BEGIN - SET @FEDateDate = GETDATE(); - END - ELSE - BEGIN - -- תΪ - SET @FEDateDate = CONVERT(DATE, @FEDate); - END + -- һ 12 31 + SET @LastDate = DATEADD(YEAR, DATEDIFF(YEAR, 0, @StartDate) - 1, 0); -- ȡ @StartDate ݵ 1 1 + SET @LastDate = DATEADD(DAY, -1, DATEADD(YEAR, 1, @StartDate)); -- ȡһ 12 31 - -- ȡһ 12 31 - SET @FEDateDate = DATEFROMPARTS(YEAR(@FEDateDate) - 1, 12, 31); + TRUNCATE TABLE YSQKGK_SBU_GZTH + --ȡڳݣ + INSERT INTO YSQKGK_SBU_GZTH([SBU],[Ӧտ],[_ӦտרС]) + SELECT + SBU, + ڽ, + CASE WHEN + տ = 'ӦտרС' THEN ڽ + ELSE null END AS '_ӦտרС' + FROM ZRP_YingShouMingXi_yuyubo + where <= @LastDate + AND [ڽ] <> 0 + + --ȡʼںͽڵ + INSERT INTO YSQKGK_SBU_GZTH([SBU],[굽Ӧտ],[_ӦտרС]) + SELECT + SBU, + ڽ, + CASE WHEN + տ = 'ӦտרС' THEN ڽ + ELSE null END AS '_ӦտרС' + FROM ZRP_YingShouMingXi_yuyubo + where [] >= @FSDate + AND [] <= @FEDate + AND [ڽ] <> 0 - --ձ - TRUNCATE TABLE YSQKGK_SBU_GZTH - --ѯʱΪǰĵڽ - SELECT [SBU],SUM([ڽ]) AS 'ڽ' INTO #NCTEMP1 FROM ZRP_YingShouMingXi_yuyubo - WHERE [ʱ] <= @FEDateDate - GROUP BY [SBU] + --зϼƣ½䵽YSQKGK_SBU_GZTH + SELECT + SBU, + SUM(Ӧտ) AS Ӧտ, + SUM(_ӦտרС) AS _ӦտרС, + SUM(굽Ӧտ) AS 굽Ӧտ, + SUM(_ӦտרС) AS _ӦտרС + INTO #TEMP1 + FROM YSQKGK_SBU_GZTH + GROUP BY SBU - --뵽ʱΪǰĵڽ - INSERT INTO YSQKGK_SBU_GZTH([SBU],[Ӧտ]) - SELECT [SBU],[ڽ] FROM #NCTEMP1 WHERE [ڽ] <> 0 + TRUNCATE TABLE YSQKGK_SBU_GZTH - --ѯʱΪǰĵڽտ=ӦտרС - SELECT [SBU],SUM([ڽ]) AS 'ڽ' INTO #NCZZTEMP1 FROM ZRP_YingShouMingXi_yuyubo - WHERE [ʱ] <= @FEDateDate AND [տ] = 'ӦտרС' - GROUP BY [SBU] + INSERT INTO YSQKGK_SBU_GZTH([SBU],[Ӧտ],[_ӦտרС],[굽Ӧտ],[_ӦտרС]) + SELECT * FROM #TEMP1 - --뵽ʱΪǰĵڽտ=ӦտרС - INSERT INTO YSQKGK_SBU_GZTH([SBU],[_ӦտרС]) - SELECT [SBU],[ڽ] FROM #NCZZTEMP1 WHERE [ڽ] <> 0 + --¼굽Ӧտܺͣռֶ + DECLARE @SUMDQJE DECIMAL(23, 10); + SELECT @SUMDQJE = SUM([굽Ӧտ]) FROM YSQKGK_SBU_GZTH + + UPDATE YSQKGK_SBU_GZTH + SET [ռ] = FORMAT(ROUND([굽Ӧտ] / @SUMDQJE * 100, 2), '0.##') + '%'; - --ѯȵʱĵڽ - SELECT [SBU],SUM([ڽ]) AS 'ڽ' INTO #BNTEMP1 - FROM ZRP_YingShouMingXi_yuyubo - WHERE - (@FSDate = '' OR [ʱ] >= @FSDate) - AND(@FEDate= '' OR [ʱ] <= @FEDate) - GROUP BY [SBU] - - --뱾ȵʱĵڽ - INSERT INTO YSQKGK_SBU_GZTH([SBU],[굽Ӧտ]) - SELECT [SBU],[ڽ] FROM #BNTEMP1 WHERE [ڽ] <> 0 - - --ѯȵʱĵڽտ=ӦտרС - SELECT [SBU],SUM([ڽ]) AS 'ڽ' INTO #BNZZTEMP1 - FROM ZRP_YingShouMingXi_yuyubo - WHERE - (@FSDate = '' OR [ʱ] >= @FSDate) - AND(@FEDate= '' OR [ʱ] <= @FEDate) - AND [տ] = 'ӦտרС' - GROUP BY [SBU] - - INSERT INTO YSQKGK_SBU_GZTH([SBU],[_ӦտרС]) - SELECT [SBU],[ڽ] FROM #BNZZTEMP1 WHERE [ڽ] <> 0 - - SELECT * - INTO #TEMP1 - FROM( - SELECT [SBU], - SUM([Ӧտ]) AS Ӧտ, - SUM([_ӦտרС]) AS _ӦտרС, - SUM([굽Ӧտ]) AS 굽Ӧտ, - SUM([_ӦտרС]) AS _ӦտרС - FROM YSQKGK_SBU_GZTH - GROUP BY [SBU] - )AS YS - - --ձ - TRUNCATE TABLE YSQKGK_SBU_GZTH - - --² - INSERT INTO YSQKGK_SBU_GZTH([SBU],[Ӧտ],[_ӦտרС], - [굽Ӧտ],[_ӦտרС]) - SELECT * FROM #TEMP1 - - --ռ - SELECT @SumDQJE = SUM([굽Ӧտ]) FROM YSQKGK_SBU_GZTH - - UPDATE YSQKGK_SBU_GZTH - SET [ռ] = CONVERT(VARCHAR, CAST(([굽Ӧտ] / @SumDQJE) * 100 AS DECIMAL(10, 2))) + '%' - - --±仯 - UPDATE YSQKGK_SBU_GZTH - SET [仯] = ISNULL([굽Ӧտ],0) - ISNULL([Ӧտ],0) - - DROP TABLE #NCTEMP1,#NCZZTEMP1,#BNTEMP1,#BNZZTEMP1,#TEMP1 -END; \ No newline at end of file + --±仯ֶ + UPDATE YSQKGK_SBU_GZTH + SET [仯] = ISNULL([굽Ӧտ],0) - ISNULL([Ӧտ],0) +END \ No newline at end of file diff --git a/派诺报表SQL文件/应收情况概况表按合同性质区分.sql b/派诺报表SQL文件/应收情况概况表按合同性质区分.sql new file mode 100644 index 0000000..3d774b8 --- /dev/null +++ b/派诺报表SQL文件/应收情况概况表按合同性质区分.sql @@ -0,0 +1,12 @@ +CREATE TABLE YinggShouHTXZ_GZTH ( + FHTXZ VARCHAR(255), + FJSLX VARCHAR(255), + ڳѳǷ DECIMAL(23, 10), + ڳѵǷ DECIMAL(23, 10), + ѳǷ DECIMAL(23, 10), + ѵǷ DECIMAL(23, 10), + ѳǷ DECIMAL(23, 10), + ѵǷ DECIMAL(23, 10) +); + +DROP TABLE YinggShouHTXZ_GZTH \ No newline at end of file diff --git a/派诺报表SQL文件/应收情况概况表按签订年份性质区分插入数据.sql b/派诺报表SQL文件/应收情况概况表按签订年份性质区分插入数据.sql new file mode 100644 index 0000000..232032a --- /dev/null +++ b/派诺报表SQL文件/应收情况概况表按签订年份性质区分插入数据.sql @@ -0,0 +1,62 @@ +ALTER PROCEDURE YSQKGKQDNF_GZTH + @FSDate NVARCHAR(100), + @FEDate NVARCHAR(100) +AS + + -- + DECLARE @StartDate DATE; + DECLARE @EndDate DATE; + DECLARE @LastDate Date; + + -- ַתΪ + SET @StartDate = CONVERT(DATE, @FSDate, 120); -- ڸʽΪ YYYY-MM-DD + SET @EndDate = CONVERT(DATE, @FEDate, 120); -- ڸʽΪ YYYY-MM-DD + + -- һ 12 31 + SET @LastDate = DATEADD(YEAR, DATEDIFF(YEAR, 0, @StartDate) - 1, 0); -- ȡ @StartDate ݵ 1 1 + SET @LastDate = DATEADD(DAY, -1, DATEADD(YEAR, 1, @StartDate)); -- ȡһ 12 31 + + TRUNCATE TABLE YSQKGK_QDNF_GZTH + INSERT INTO YSQKGK_QDNF_GZTH([ǩ],[ڳӦտ]) + SELECT + [ǩ], + [ڽ] + FROM ZRP_YingShouMingXi_yuyubo + WHERE[] <= @LastDate + AND [ڽ] <> 0 + + --ڼĵڽ + INSERT INTO YSQKGK_QDNF_GZTH([ǩ],[µӦտ]) + SELECT + [ǩ], + [ڽ] + FROM ZRP_YingShouMingXi_yuyubo + WHERE[] >= @StartDate + AND [] <= @EndDate + AND [ڽ] <> 0 + + --ݽзϼƣԭ + SELECT + [ǩ], + SUM([ڳӦտ]) as ڳӦտ , + SUM([µӦտ]) as µӦտ + INTO #TEMP1 + FROM YSQKGK_QDNF_GZTH + GROUP BY [ǩ] + + --ձʱݲ뵽 + TRUNCATE TABLE YSQKGK_QDNF_GZTH + INSERT INTO YSQKGK_QDNF_GZTH([ǩ],[ڳӦտ],[µӦտ]) + SELECT * FROM #TEMP1 + + --ռ + --¼굽Ӧտܺͣռֶ + DECLARE @SUMDQJE DECIMAL(23, 10); + SELECT @SUMDQJE = SUM([µӦտ]) FROM YSQKGK_QDNF_GZTH + + UPDATE YSQKGK_QDNF_GZTH + SET [ռ] = FORMAT(ROUND([µӦտ] / @SUMDQJE * 100, 2), '0.##') + '%'; + + --仯ֵ + UPDATE YSQKGK_QDNF_GZTH + SET [仯] = [µӦտ]-[ڳӦտ]; diff --git a/派诺报表SQL文件/应收情况概括表按签订年份区分.sql b/派诺报表SQL文件/应收情况概括表按签订年份区分.sql new file mode 100644 index 0000000..65b5bca --- /dev/null +++ b/派诺报表SQL文件/应收情况概括表按签订年份区分.sql @@ -0,0 +1,7 @@ +CREATE TABLE YSQKGK_QDNF_GZTH ( + [ǩ] nvarchar(1000), -- ͬǩ + [ڳӦտ] DECIMAL(23, 10), -- ڳӦտ + [µӦտ] DECIMAL(23, 10), -- µӦտ + [ռ] nvarchar(1000), -- ռȣλС + [仯] DECIMAL(23, 10) -- 仯λС +); \ No newline at end of file