diff --git a/.vs/GZ_LTHReportForms.csproj.dtbcache.json b/.vs/GZ_LTHReportForms.csproj.dtbcache.json
deleted file mode 100644
index 6169ee9..0000000
--- a/.vs/GZ_LTHReportForms.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"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
deleted file mode 100644
index a56c040..0000000
Binary files a/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/CodeChunks.db and /dev/null 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
deleted file mode 100644
index 1229230..0000000
Binary files a/.vs/GZ_LTHReportForms/CopilotIndices/17.14.734.62261/SemanticSymbols.db and /dev/null 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
deleted file mode 100644
index 200c7f6..0000000
Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/03001a07-4607-4a3b-8a03-9c67699d55dd.vsidx and /dev/null 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
deleted file mode 100644
index 6387121..0000000
Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/196a50f0-1df5-41c9-b41d-48bcd8f84b2d.vsidx and /dev/null 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
deleted file mode 100644
index fb21648..0000000
Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/913d823f-801e-4fe2-97e5-9ab936a3ae54.vsidx and /dev/null differ
diff --git a/.vs/GZ_LTHReportForms/config/applicationhost.config b/.vs/GZ_LTHReportForms/config/applicationhost.config
deleted file mode 100644
index ca16466..0000000
--- a/.vs/GZ_LTHReportForms/config/applicationhost.config
+++ /dev/null
@@ -1,969 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.vs/GZ_LTHReportForms/v16/.suo b/.vs/GZ_LTHReportForms/v16/.suo
deleted file mode 100644
index dc186bc..0000000
Binary files a/.vs/GZ_LTHReportForms/v16/.suo and /dev/null differ
diff --git a/.vs/GZ_LTHReportForms/v17/.suo b/.vs/GZ_LTHReportForms/v17/.suo
deleted file mode 100644
index 450eb88..0000000
Binary files a/.vs/GZ_LTHReportForms/v17/.suo and /dev/null differ
diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json
deleted file mode 100644
index 758dd78..0000000
--- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\",
- "Documents": [
- {
- "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": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "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": "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": 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": ""
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json
deleted file mode 100644
index 0fe415e..0000000
--- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\",
- "Documents": [
- {
- "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": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 0,
- "Children": [
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "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-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"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
deleted file mode 100644
index f8b4888..0000000
--- a/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "CurrentProjectSetting": null
-}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 9147ad9..0000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "ExpandedNodes": [
- "",
- "\\YingShouBiao"
- ],
- "SelectedNode": "\\GZ_LTHReportForms.sln",
- "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
deleted file mode 100644
index 613b581..0000000
Binary files a/.vs/slnx.sqlite and /dev/null differ
diff --git a/DDWFHMX.cs b/DDWFHMX.cs
index db03689..63d5a4a 100644
--- a/DDWFHMX.cs
+++ b/DDWFHMX.cs
@@ -76,6 +76,12 @@ namespace GZ_LTHReportForms.ReporyDDWFH
header.AddChild("未发货金额", new LocaleValue("未发货金额"), SqlStorageType.SqlDecimal);
header.AddChild("合同类型", new LocaleValue("合同类型"), SqlStorageType.Sqlnvarchar);
header.AddChild("发货条件", new LocaleValue("发货条件"), SqlStorageType.Sqlnvarchar);
+ header.AddChild("星空已发货数量", new LocaleValue("星空已发货数量"), SqlStorageType.SqlDecimal);
+ header.AddChild("星空已发货金额", new LocaleValue("星空已发货金额"), SqlStorageType.SqlDecimal);
+ header.AddChild("星空未发货数量", new LocaleValue("星空未发货数量"), SqlStorageType.SqlDecimal);
+ header.AddChild("K3已发货数量", new LocaleValue("K3已发货数量"), SqlStorageType.SqlDecimal);
+ header.AddChild("K3已发货金额", new LocaleValue("K3已发货金额"), SqlStorageType.SqlDecimal);
+ header.AddChild("K3未发货数量", new LocaleValue("K3未发货数量"), SqlStorageType.SqlDecimal);
foreach (var item in header.GetChilds())
{
diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs
index 9f9701a..5bc5c21 100644
--- a/YSZKDZBaoBiao/AccountsReceivableReport.cs
+++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs
@@ -93,6 +93,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar);
header.AddChild("FSalerId", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar);
header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar);
+ header.AddChild("K3专票金额", new LocaleValue("K3专票金额"), SqlStorageType.SqlDecimal);
+ header.AddChild("K3普票金额", new LocaleValue("K3普票金额"), SqlStorageType.SqlDecimal);
foreach (var item in header.GetChilds())
{
diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs
index c69d5a8..1fa50f1 100644
--- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs
+++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs
@@ -12,6 +12,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Data;
using Kingdee.BOS.Core.Enums;
+using Kingdee.BOS.Log;
namespace Pilot.Report.Exploitation.AccountsReceivableStatements
{
@@ -102,6 +103,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar);
header.AddChild("FSalerId", new LocaleValue("销售员"), SqlStorageType.Sqlvarchar);
header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar);
+ header.AddChild("K3专票金额", new LocaleValue("K3专票金额"), SqlStorageType.SqlDecimal);
+ header.AddChild("K3普票金额", new LocaleValue("K3普票金额"), SqlStorageType.SqlDecimal);
foreach (var item in header.GetChilds())
{
@@ -197,6 +200,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
{
sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')");
}
+ Logger.Error("sql脚本", sql, new Exception());
DBUtils.Execute(this.Context, sql);
}
diff --git a/bin/Debug/GZ_LTHReportForms.dll b/bin/Debug/GZ_LTHReportForms.dll
deleted file mode 100644
index f001a67..0000000
Binary files a/bin/Debug/GZ_LTHReportForms.dll and /dev/null differ
diff --git a/bin/Debug/GZ_LTHReportForms.pdb b/bin/Debug/GZ_LTHReportForms.pdb
deleted file mode 100644
index 652063a..0000000
Binary files a/bin/Debug/GZ_LTHReportForms.pdb and /dev/null differ
diff --git a/bin/Debug/ICSharpCode.SharpZipLib.dll b/bin/Debug/ICSharpCode.SharpZipLib.dll
deleted file mode 100644
index 49a1d1a..0000000
Binary files a/bin/Debug/ICSharpCode.SharpZipLib.dll and /dev/null differ
diff --git a/bin/Debug/Kingdee.BOS.App.dll b/bin/Debug/Kingdee.BOS.App.dll
deleted file mode 100644
index b1467d2..0000000
Binary files a/bin/Debug/Kingdee.BOS.App.dll and /dev/null differ
diff --git a/bin/Debug/Kingdee.BOS.Contracts.dll b/bin/Debug/Kingdee.BOS.Contracts.dll
deleted file mode 100644
index 2da2dc6..0000000
Binary files a/bin/Debug/Kingdee.BOS.Contracts.dll and /dev/null differ
diff --git a/bin/Debug/Kingdee.BOS.Core.dll b/bin/Debug/Kingdee.BOS.Core.dll
deleted file mode 100644
index cedd95a..0000000
Binary files a/bin/Debug/Kingdee.BOS.Core.dll and /dev/null differ
diff --git a/bin/Debug/Kingdee.BOS.DataEntity.dll b/bin/Debug/Kingdee.BOS.DataEntity.dll
deleted file mode 100644
index f3b2391..0000000
Binary files a/bin/Debug/Kingdee.BOS.DataEntity.dll and /dev/null differ
diff --git a/bin/Debug/Kingdee.BOS.dll b/bin/Debug/Kingdee.BOS.dll
deleted file mode 100644
index 0b9ac56..0000000
Binary files a/bin/Debug/Kingdee.BOS.dll and /dev/null differ
diff --git a/bin/Debug/NPOI.OOXML.dll b/bin/Debug/NPOI.OOXML.dll
deleted file mode 100644
index 9425561..0000000
Binary files a/bin/Debug/NPOI.OOXML.dll and /dev/null differ
diff --git a/bin/Debug/NPOI.OpenXml4Net.dll b/bin/Debug/NPOI.OpenXml4Net.dll
deleted file mode 100644
index 782ec33..0000000
Binary files a/bin/Debug/NPOI.OpenXml4Net.dll and /dev/null differ
diff --git a/bin/Debug/NPOI.OpenXmlFormats.dll b/bin/Debug/NPOI.OpenXmlFormats.dll
deleted file mode 100644
index bd832c7..0000000
Binary files a/bin/Debug/NPOI.OpenXmlFormats.dll and /dev/null differ
diff --git a/bin/Debug/NPOI.dll b/bin/Debug/NPOI.dll
deleted file mode 100644
index 2ed0bf4..0000000
Binary files a/bin/Debug/NPOI.dll and /dev/null differ
diff --git a/bin/Debug/Oracle.DataAccess.dll b/bin/Debug/Oracle.DataAccess.dll
deleted file mode 100644
index 910c9c5..0000000
Binary files a/bin/Debug/Oracle.DataAccess.dll and /dev/null differ
diff --git a/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
deleted file mode 100644
index 15efebf..0000000
--- a/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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 1053005..0000000
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/obj/Debug/GZ_LTHRe.A59FB3A8.Up2Date b/obj/Debug/GZ_LTHRe.A59FB3A8.Up2Date
deleted file mode 100644
index e69de29..0000000
diff --git a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache b/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache
deleted file mode 100644
index f678bf3..0000000
Binary files a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache b/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 41b8e3f..0000000
--- a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-0a2685ad3f2eb2618df18b0bd8e3416134f97c0f2b82d87b412eba7089ff8d21
diff --git a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt
deleted file mode 100644
index 562eb7d..0000000
--- a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\GZ_LTHReportForms.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\GZ_LTHReportForms.pdb
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Kingdee.BOS.App.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Kingdee.BOS.Contracts.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Kingdee.BOS.Core.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Kingdee.BOS.DataEntity.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Kingdee.BOS.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Newtonsoft.Json.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\bin\Debug\Oracle.DataAccess.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\obj\Debug\GZ_LTHReportForms.csproj.CoreCompileInputs.cache
-E:\GZC#Code\派诺\GZ_LTHReportForms\obj\Debug\GZ_LTHReportForms.dll
-E:\GZC#Code\派诺\GZ_LTHReportForms\obj\Debug\GZ_LTHReportForms.pdb
-E:\GZC#Code\派诺\GZ_LTHReportForms\obj\Debug\GZ_LTHReportForms.csproj.AssemblyReference.cache
-E:\GZC#Code\派诺\GZ_LTHReportForms\obj\Debug\GZ_LTHRe.A59FB3A8.Up2Date
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\GZ_LTHReportForms.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\GZ_LTHReportForms.pdb
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Kingdee.BOS.App.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Kingdee.BOS.Contracts.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Kingdee.BOS.Core.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Kingdee.BOS.DataEntity.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\Kingdee.BOS.dll
-E:\GZC#Code\派诺\PiolotTH_ReportFrom\bin\Debug\NPOI.dll
-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
diff --git a/obj/Debug/GZ_LTHReportForms.dll b/obj/Debug/GZ_LTHReportForms.dll
deleted file mode 100644
index f001a67..0000000
Binary files a/obj/Debug/GZ_LTHReportForms.dll and /dev/null differ
diff --git a/obj/Debug/GZ_LTHReportForms.pdb b/obj/Debug/GZ_LTHReportForms.pdb
deleted file mode 100644
index 652063a..0000000
Binary files a/obj/Debug/GZ_LTHReportForms.pdb and /dev/null differ
diff --git a/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs
deleted file mode 100644
index 15efebf..0000000
--- a/obj/Release/.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/派诺报表SQL文件/业绩排行榜插入数据SQL.sql b/派诺报表SQL文件/业绩排行榜插入数据SQL.sql
index f75fc57..29823b5 100644
--- a/派诺报表SQL文件/业绩排行榜插入数据SQL.sql
+++ b/派诺报表SQL文件/业绩排行榜插入数据SQL.sql
@@ -54,7 +54,8 @@ TRUNCATE TABLE YJPHB_GZTH
WHERE A.FSALEORGID = 100302 AND
ACO. = '̼ǿ'
OR ACL. = '̼ǿ'
- OR C.FNAME IN ('ŵƼۣ˾','人ŵƼչ˾')
+ OR C.FNAME IN ('ŵƼۣ˾','人ŵƼչ˾','ͻ-ʹ'
+ ,'麣˾','麣ŵԴ˾','㶫̼ǿؿƼ˾','㶫ŵܿƼ˾')
OR (C.FCUSTID = 1150173 AND (ACO. = 'Ŷ' OR ACL. = 'Ŷ'))
OR L.FNAME = 'ŵ'
OR A.FID IN (110185,207800)
@@ -230,30 +231,54 @@ TRUNCATE TABLE YJPHB_GZTH
SELECT [(SBU)],[ϸ],[Ա],[ҵ] FROM #SixYearEMP1 WHERE [] = '2019'
--ѯ֯µտ
-SELECT
-A.FSALEORGID AS '֯FID',
-O.FNAME AS 'Ա'
-,A.FREALRECAMOUNT AS 'տ'
+--SELECT
+--A.FSALEORGID AS '֯FID',
+--O.FNAME AS 'Ա'
+--,A.FREALRECAMOUNT AS 'տ'
+--,ACO. AS '_SBU'
+--,ACO.ϸ AS 'ϸ'
+--INTO #SKTEMP1
+--FROM T_AR_RECEIVEBILL A
+--INNER JOIN V_BD_SALESMAN_L O ON O.fid= A.FSALEERID
+--INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.ϸ,'') != ''
+--WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+SELECT
+t1.FSaleOrgId AS '֯FID',
+t3.FNAME AS 'Ա'
+,t1.BenCiHeXiao AS 'տ'
,ACO. AS '_SBU'
-,ACO.ϸ AS 'ϸ'
-INTO #SKTEMP1
-FROM T_AR_RECEIVEBILL A
-INNER JOIN V_BD_SALESMAN_L O ON O.fid= A.FSALEERID
-INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=O.FNAME AND ISNULL(ACO.ϸ,'') != ''
-WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+,ACO.ϸ AS 'ϸ'
+INTO #SKTEMP1
+FROM ZZZ_HeXiaoBook t1
+INNER JOIN T_SAL_ORDER t2 ON t1.XiaoShouFid = t2.FID
+INNER JOIN V_BD_SALESMAN_L t3 ON t3.fid= t2.FSALERID
+INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=t3.FNAME AND ISNULL(ACO.ϸ,'') != ''
+WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM SalesIDTable)) AND t1.ShoukuanType = 0
--ѯ֯µտ˿
-SELECT
-A.FSALEORGID AS '֯FID',
-B.FNAME AS 'Ա',
-A.FREFUNDAMOUNT_H * -1 AS 'տ˿'
+--SELECT
+--A.FSALEORGID AS '֯FID',
+--B.FNAME AS 'Ա',
+--A.FREFUNDAMOUNT_H * -1 AS 'տ˿'
+--,ACO. AS '_SBU'
+--,ACO.ϸ AS 'ϸ'
+--INTO #SKTKTEMP1
+--FROM T_AR_REFUNDBILL A
+--INNER JOIN V_BD_SALESMAN_L B ON A.FSALEERID = B.fid
+--INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=B.FNAME AND ISNULL(ACO.ϸ,'') != ''
+--WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+SELECT
+t1.FSaleOrgId AS '֯FID',
+t3.FNAME AS 'Ա'
+,t1.BenCiHeXiao AS 'տ˿'
,ACO. AS '_SBU'
-,ACO.ϸ AS 'ϸ'
-INTO #SKTKTEMP1
-FROM T_AR_REFUNDBILL A
-INNER JOIN V_BD_SALESMAN_L B ON A.FSALEERID = B.fid
-INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=B.FNAME AND ISNULL(ACO.ϸ,'') != ''
-WHERE (@FSaleOrgId = '' Or A.FSALEORGID IN (SELECT SalesID FROM SalesIDTable))
+,ACO.ϸ AS 'ϸ'
+INTO #SKTKTEMP1
+FROM ZZZ_HeXiaoBook t1
+INNER JOIN T_SAL_ORDER t2 ON t1.XiaoShouFid = t2.FID
+INNER JOIN V_BD_SALESMAN_L t3 ON t3.fid= t2.FSALERID
+INNER JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.=t3.FNAME AND ISNULL(ACO.ϸ,'') != ''
+WHERE (@FSaleOrgId = '' Or t1.FSaleOrgId IN (SELECT SalesID FROM SalesIDTable)) AND t1.ShoukuanType = 1
--ŵۼƻؿ(ο۶ۼƺ)
diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql
index a41bbe3..7ece05f 100644
--- a/派诺报表SQL文件/应收对账表(明细创建).sql
+++ b/派诺报表SQL文件/应收对账表(明细创建).sql
@@ -1,89 +1,156 @@
-ALTER PROCEDURE UpdateYSDZBMX_GZTH
-@FSDATE varchar(1000),
-@FEDATE varchar(1000),
-@FSaleOrgId varchar(1000),
-@FCUSTID varchar(1000)
-AS
-BEGIN
- DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
- DECLARE @EndDate DATE = CONVERT(DATE, @FEDATE);
-
- -- һ
- SET @EndDate = DATEADD(DAY, 1, @EndDate);
-
- TRUNCATE TABLE YingShouZhanKuanMX;
-
- INSERT INTO YingShouZhanKuanMX (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,ShipmentsNum,
- ShipmentsAmount,ReturnNum,ReturnAmount,PaymentAmount)
- SELECT
- A.FID AS ۶FID
- ,B.FENTRYID AS ۶FENTRYID
- ,A.FSaleOrgId AS ֯
- ,A.FBILLNO AS ۶
- ,A.FSalerId AS ԱFID
- ,FORMAT( A.FApproveDate,'yyyy-MM-dd') AS ǩ
- ,A.F_contractnumber AS
- ,GC.FNAME AS Ŀ
- ,WL_L.FSpecification AS ͺ
- ,B.FQTY AS ̨
- ,B_F.FTAXPRICE AS
- ,B_F.FALLAMOUNT_LC AS ˰ϼ
- ,AF.FBillAllAmount
- ,B.F_sendQty AS
- ,B.F_sendAmount AS
- ,F_returnQty AS ˻
- ,F_returnAmount AS ˻
- ,A.F_Amount AS ۼƺ
- FROM T_SAL_ORDER A
- INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID
- INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID
- INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
- INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID
- INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
- WHERE A.FSaleOrgId = @FSaleOrgId
- AND A.FCUSTID = @FCUSTID
- AND A.FApproveDate >= @StartDate
- AND A.FApproveDate <= @EndDate
-
- --·ڣͷ
- SELECT
- C.FSBILLID AS ۶FID
- ,C.FSID AS ۶FENTRYID
- ,A.FApproveDate AS
- ,B.FQTY AS
- ,B_F.FAllAmount_LC AS
- INTO #TEMP1
- FROM T_SAL_DELIVERYNOTICE A
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
- INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
- WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX)
- AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX)
-
-
- UPDATE A
- SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd'),ShipmentsNum = ShipmentsNum+B.,ShipmentsAmount = ShipmentsAmount + B.
- FROM YingShouZhanKuanMX A
- INNER JOIN #TEMP1 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID
-
- --˻ڣ˻˻
- SELECT
- C.FSBILLID AS ۶FID
- ,C.FSID AS ۶FENTRYID
- ,A.FDATE AS ˻
- ,B.FQTY AS ˻
- ,B_F.FALLAMOUNT_LC AS ˻
- INTO #TEMP2
- FROM T_SAL_RETURNNOTICE A
- INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID
- INNER JOIN T_SAL_RETURNNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
- INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
-
- UPDATE A
- SET ReturnDate = FORMAT( B.˻,'yyyy-MM-dd'),ReturnNum = ShipmentsNum+B.˻,ReturnAmount = ShipmentsAmount + B.˻
- FROM YingShouZhanKuanMX A
- INNER JOIN #TEMP2 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID
-
-END
-
-
+ALTER PROCEDURE UpdateYSDZBMX_GZTH
+@FSDATE varchar(1000),
+@FEDATE varchar(1000),
+@FSaleOrgId varchar(1000),
+@FCUSTID varchar(1000),
+@XSYFID varchar(1000),
+@ZZHTH varchar(1000)
+AS
+BEGIN
+ DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
+ DECLARE @EndDate DATE = CONVERT(DATE, @FEDATE);
+
+ -- һ
+ SET @EndDate = DATEADD(DAY, 1, @EndDate);
+
+ TRUNCATE TABLE YingShouZhanKuanMX_GZTH;
+
+ INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[ǷK3])
+ SELECT
+ A.FID AS ۶FID
+ ,B.FENTRYID AS ۶FENTRYID
+ ,A.FSaleOrgId AS ֯
+ ,A.FBILLNO AS ۶
+ ,XS.FNAME AS ԱFID
+ ,FORMAT( A.FApproveDate,'yyyy-MM-dd') AS ǩ
+ ,A.F_contractnumber AS
+ ,GC.FNAME AS Ŀ
+ ,WL_L.FSpecification AS ͺ
+ ,B.FQTY AS ̨
+ ,B_F.FTAXPRICE AS
+ ,B_F.FALLAMOUNT_LC AS ˰ϼ
+ ,AF.FBillAllAmount
+ ,A.F_Amount AS ۼƺ
+ ,0 AS ǷK3
+ FROM T_SAL_ORDER A
+ INNER JOIN T_SAL_ORDERFIN AF ON A.FID = AF.FID
+ INNER JOIN T_BAS_PREBDONE_L GC ON A.F_projectname = GC.FID
+ INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID
+ INNER JOIN T_BD_MATERIAL_L WL_L ON B.FMATERIALID = WL_L.FMATERIALID
+ INNER JOIN T_SAL_ORDERENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
+ INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = A.FSALERID
+ WHERE A.FSaleOrgId = @FSaleOrgId
+ AND A.FCUSTID = @FCUSTID
+ AND A.FApproveDate >= @StartDate
+ AND A.FApproveDate <= @EndDate
+ AND (ISNULL(@XSYFID, '') = '' OR A.FSalerId = @XSYFID)
+ AND (ISNULL(@ZZHTH,'') = '' OR A.F_contractnumber = @ZZHTH)
+
+ --K3
+ INSERT INTO YingShouZhanKuanMX_GZTH (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,[K3],[K3],[K3˻],[K3˻],[K3Ʊ],[K3רƱ],[ǷK3])
+ SELECT
+ B.FID AS ۶FID
+ ,0 AS ۶FENTRYID
+ ,B.FSaleOrgId AS ֯
+ ,B.FBILLNO AS ۶
+ ,XS.FNAME AS ԱFID
+ ,FORMAT( B.FApproveDate,'yyyy-MM-dd') AS ǩ
+ ,B.F_contractnumber AS
+ ,GC.FNAME AS Ŀ
+ ,A.ͺ AS ͺ
+ ,A. AS
+ ,A. AS
+ ,A.˻ AS ˻
+ ,A.˻ AS ˻
+ ,A.Ʊ AS Ʊ
+ ,A.רƱ AS רƱ
+ ,1 AS ǷK3
+ FROM oldk3seorder0701 A
+ INNER JOIN T_SAL_ORDER B ON A.ݱ = B.FBILLNO
+ INNER JOIN T_BAS_PREBDONE_L GC ON B.F_projectname = GC.FID
+ INNER JOIN V_BD_SALESMAN_L XS ON XS.FID = B.FSALERID
+ WHERE B.FSaleOrgId = @FSaleOrgId
+ AND B.FCUSTID = @FCUSTID
+ AND B.FApproveDate >= @StartDate
+ AND B.FApproveDate <= @EndDate
+ AND (ISNULL(@XSYFID, '') = '' OR B.FSalerId = @XSYFID)
+ AND (ISNULL(@ZZHTH,'') = '' OR B.F_contractnumber = @ZZHTH)
+
+ --·ڣͷ
+ SELECT
+ C.FSBILLID AS ۶FID
+ ,C.FSID AS ۶FENTRYID
+ ,A.FApproveDate AS
+ ,B.FQTY AS
+ ,B_F.FAllAmount_LC AS
+ INTO #TEMP1
+ FROM T_SAL_DELIVERYNOTICE A
+ INNER JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID
+ INNER JOIN T_SAL_DELIVERYNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
+ INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
+ WHERE C.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH)
+ AND C.FSID IN (SELECT FENTRYID FROM YingShouZhanKuanMX_GZTH)
+
+ ----k3
+ --update A
+ --SET A.K3 = C.,A.K3 = C.
+ --FROM YingShouZhanKuanMX_GZTH A
+ --INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID
+ --INNER JOIN T_BD_MATERIAL D ON B.FMATERIALID = B.FMaterialId
+ --INNER JOIN oldk3seorder0701 C ON A.FBILLNO = C.ݱ AND A.CONTRACTNUMBER = C.Ŀ AND D.FOldNumber = C.ϱ
+
+ SELECT
+ ۶FID,
+ ۶FENTRYID,
+ SUM() AS ,
+ SUM() AS
+ INTO #FHTEMP1
+ FROM #TEMP1
+ GROUP BY ۶FID,۶FENTRYID
+
+ UPDATE A
+ SET ShipmentsDate = FORMAT( B.,'yyyy-MM-dd')
+ FROM YingShouZhanKuanMX_GZTH A
+ INNER JOIN #TEMP1 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID
+
+ UPDATE A
+ SET A.ǿշ = B.,A.ǿշ = B.
+ FROM YingShouZhanKuanMX_GZTH A
+ INNER JOIN #FHTEMP1 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID
+
+ --·
+ UPDATE A
+ SET A.ShipmentsNum = ISNULL([ǿշ],0) + ISNULL([K3],0),A.ShipmentsAmount = ISNULL([ǿշ],0) + ISNULL([K3],0)
+ FROM YingShouZhanKuanMX_GZTH A
+
+
+ --˻ڣ˻˻
+ SELECT
+ C.FSBILLID AS ۶FID
+ ,C.FSID AS ۶FENTRYID
+ ,A.FDATE AS ˻
+ ,B.FQTY AS ˻
+ ,B_F.FALLAMOUNT_LC AS ˻
+ INTO #TEMP2
+ FROM T_SAL_RETURNNOTICE A
+ INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID
+ INNER JOIN T_SAL_RETURNNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID
+ INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY'
+
+ ----k3˻
+ --update A
+ --SET A.K3˻ = C.˻,A.K3˻ = C.˻
+ --FROM YingShouZhanKuanMX_GZTH A
+ --INNER JOIN T_SAL_ORDERENTRY B ON A.FID = B.FID AND A.FENTRYID = B.FENTRYID
+ --INNER JOIN T_BD_MATERIAL D ON B.FMATERIALID = B.FMaterialId
+ --INNER JOIN oldk3seorder0701 C ON A.FBILLNO = C.ݱ AND A.CONTRACTNUMBER = C.Ŀ AND D.FOldNumber = C.ϱ
+
+ UPDATE A
+ SET ReturnDate = FORMAT( B.˻,'yyyy-MM-dd'),A.ǿ˻ = B.˻,A.ǿ˻ = B.˻
+ FROM YingShouZhanKuanMX_GZTH A
+ INNER JOIN #TEMP2 B ON A.FID = B.۶FID AND A.FENTRYID = B.۶FENTRYID
+
+ update YingShouZhanKuanMX_GZTH
+ SET ReturnNum = K3˻ + ǿ˻, ReturnAmount = K3˻ + ǿ˻
+
+END
\ No newline at end of file