diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/8cf97a57-5616-4376-8f21-441751eb0fbe.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/8cf97a57-5616-4376-8f21-441751eb0fbe.vsidx deleted file mode 100644 index 490751d..0000000 Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/8cf97a57-5616-4376-8f21-441751eb0fbe.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/ae9d4cea-bd72-45ff-b218-92e46df0975d.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/ae9d4cea-bd72-45ff-b218-92e46df0975d.vsidx deleted file mode 100644 index 6a55e52..0000000 Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/ae9d4cea-bd72-45ff-b218-92e46df0975d.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/d84df2d3-8dad-4e67-8802-80eebe542d7a.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/d84df2d3-8dad-4e67-8802-80eebe542d7a.vsidx deleted file mode 100644 index 387de5f..0000000 Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/d84df2d3-8dad-4e67-8802-80eebe542d7a.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHReportForms/FileContentIndex/fc4db7e1-276b-4d83-bfcf-1bacb1712aa9.vsidx b/.vs/GZ_LTHReportForms/FileContentIndex/fc4db7e1-276b-4d83-bfcf-1bacb1712aa9.vsidx deleted file mode 100644 index 06c4e2c..0000000 Binary files a/.vs/GZ_LTHReportForms/FileContentIndex/fc4db7e1-276b-4d83-bfcf-1bacb1712aa9.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHReportForms/v17/.suo b/.vs/GZ_LTHReportForms/v17/.suo index c107b29..c14c3ad 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 5509418..7b6bffa 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.backup.json @@ -3,40 +3,44 @@ "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\\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:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yskdzgongneng_jy\\liteversionplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\liteversionplugin.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:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yszkdzgongneng_mx\\liteversionplugin2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzgongneng_mx\\liteversionplugin2.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\\yskdzgongneng_jy\\yourdataplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\yourdataplugin.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\\yskdzgongneng_jy\\programnumber.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\programnumber.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\\accountsreceivablefiter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablefiter.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\\accountsreceivableplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivableplugin.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\\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}", "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:{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\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(\u660E\u7EC6\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\\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(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.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)\u66F4\u65B0\u6570\u636E.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(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.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)\u66F4\u65B0\u6570\u636E.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(\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\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(\u660E\u7EC6\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + "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}|CodeFrame", @@ -50,77 +54,134 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 5, + "SelectedChildIndex": 3, "Children": [ { "$type": "Document", - "DocumentIndex": 5, - "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql ", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql", - "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql", - "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-22T04:02:31.924Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "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-05-22T04:02:31.575Z", + "DocumentIndex": 1, + "Title": "LiteVersionPlugIn2.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "RelativeDocumentMoniker": "YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "RelativeToolTip": "YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "ViewState": "AgIAAJ8AAAAAAAAAAAAlwOEAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:44.276Z", "EditorCaption": "" }, { "$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-05-19T11:59:20.049Z", + "Title": "YourDataPlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "RelativeToolTip": "YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "ViewState": "AgIAAAYAAAAAAAAAAAAAAG4AAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:24.692Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, - "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql ", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql", - "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql", - "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-19T11:59:19.579Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "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": "AgIAABwBAAAAAAAAAAAAAC4BAABXAAAAAAAAAA==", + "Title": "ProgramNumber.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\ProgramNumber.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\ProgramNumber.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\ProgramNumber.cs", + "RelativeToolTip": "YSKDZGongNeng_JY\\ProgramNumber.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-16T05:44:26.867Z", + "WhenOpened": "2025-06-16T16:32:21.988Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 0, + "Title": "LiteVersionPlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\LiteVersionPlugIn.cs*", + "RelativeToolTip": "YSKDZGongNeng_JY\\LiteVersionPlugIn.cs*", + "ViewState": "AgIAAAYCAAAAAAAAAAAQwDACAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:20.773Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "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": "AgIAAFQBAAAAAAAAAAAAAGEBAABXAAAAAAAAAA==", + "ViewState": "AgIAAIQAAAAAAAAAAAAAAJQAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T10:49:24.474Z", + "WhenOpened": "2025-06-16T16:25:07.023Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "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-06-16T16:20:26.137Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "AccountsReceivablePlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:43:55.583Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "AccountsReceivableFiter.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:43:54.022Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "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": "AgIAAIYAAAAAAAAAAAAUwJMAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:36:17.602Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "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": "AgIAAFEAAAAAAAAAAAAQwG4AAAAvAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-14T02:01:57.087Z" } ] } diff --git a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json index ae3997a..292cd7d 100644 --- a/.vs/GZ_LTHReportForms/v17/DocumentLayout.json +++ b/.vs/GZ_LTHReportForms/v17/DocumentLayout.json @@ -3,14 +3,28 @@ "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\t4tlj3px..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\\yskdzgongneng_jy\\liteversionplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\liteversionplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\nfylowvm..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\\yszkdzgongneng_mx\\liteversionplugin2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzgongneng_mx\\liteversionplugin2.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:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolotth_reportfrom\\yskdzgongneng_jy\\yourdataplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\yourdataplugin.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\\yskdzgongneng_jy\\programnumber.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yskdzgongneng_jy\\programnumber.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\\accountsreceivablefiter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivablefiter.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\\accountsreceivableplugin.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{D635EAA4-25EF-45D7-8AE4-A4A4EA71FE54}|GZ_LTHReportForms.csproj|solutionrelative:yszkdzbaobiao\\accountsreceivableplugin.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\\accountsreceivablereport2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -21,44 +35,16 @@ "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:{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\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(\u660E\u7EC6\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\\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(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.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)\u66F4\u65B0\u6570\u636E.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(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.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)\u66F4\u65B0\u6570\u636E.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(\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\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(\u660E\u7EC6\u521B\u5EFA).sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + "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}|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" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\nfylowvm..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\nfylowvm..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\t4tlj3px..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\t4tlj3px..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" } ], "DocumentGroupContainers": [ @@ -68,97 +54,134 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 0, + "SelectedChildIndex": 3, "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "SQLQuery2.sql ", - "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\t4tlj3px..sql", - "ToolTip": "SQLQuery2.sql *", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-29T06:10:09.176Z", - "EditorCaption": "" - }, { "$type": "Document", "DocumentIndex": 1, - "Title": "SQLQuery1.sql ", - "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\nfylowvm..sql", - "ToolTip": "SQLQuery1.sql *", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-29T03:05:04.543Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 7, - "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql ", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql", - "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql", - "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u7B80\u6613)\u66F4\u65B0\u6570\u636E.sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-22T04:02:31.924Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "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-05-22T04:02:31.575Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "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-05-19T11:59:20.049Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 5, - "Title": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql ", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql", - "RelativeDocumentMoniker": "\u6D3E\u8BFA\u62A5\u8868SQL\u6587\u4EF6\\\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql", - "ToolTip": "\u5E94\u6536\u5BF9\u8D26\u8868(\u660E\u7EC6\u521B\u5EFA).sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-05-19T11:59:19.579Z", + "Title": "LiteVersionPlugIn2.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "RelativeDocumentMoniker": "YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "RelativeToolTip": "YSZKDZGongNeng_MX\\LiteVersionPlugIn2.cs", + "ViewState": "AgIAAJ8AAAAAAAAAAAAlwOEAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:44.276Z", "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": "AgIAAGEAAAAAAAAAAAAvwGMAAAA5AAAAAAAAAA==", + "Title": "YourDataPlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "RelativeToolTip": "YSKDZGongNeng_JY\\YourDataPlugIn.cs", + "ViewState": "AgIAAAYAAAAAAAAAAAAAAG4AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-16T05:44:26.867Z", + "WhenOpened": "2025-06-16T16:32:24.692Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 3, + "Title": "ProgramNumber.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\ProgramNumber.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\ProgramNumber.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\ProgramNumber.cs", + "RelativeToolTip": "YSKDZGongNeng_JY\\ProgramNumber.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:21.988Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "LiteVersionPlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "RelativeDocumentMoniker": "YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "RelativeToolTip": "YSKDZGongNeng_JY\\LiteVersionPlugIn.cs", + "ViewState": "AgIAAK0AAAAAAAAAAAAUwDACAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T16:32:20.773Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "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": "AgIAAFQBAAAAAAAAAAAAAGABAAAVAAAAAAAAAA==", + "ViewState": "AgIAAIQAAAAAAAAAAAAAAJQAAAAjAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T10:49:24.474Z", + "WhenOpened": "2025-06-16T16:25:07.023Z", "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "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-06-16T16:20:26.137Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "AccountsReceivablePlugIn.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivablePlugIn.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:43:55.583Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "AccountsReceivableFiter.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "RelativeDocumentMoniker": "YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\PiolotTH_ReportFrom\\YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "RelativeToolTip": "YSZKDZBaoBiao\\AccountsReceivableFiter.cs", + "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:43:54.022Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "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": "AgIAAIYAAAAAAAAAAAAUwJMAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-16T15:36:17.602Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "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": "AgIAAFEAAAAAAAAAAAAQwG4AAAAvAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-06-14T02:01:57.087Z" } ] } diff --git a/DDWFHMX.cs b/DDWFHMX.cs index 79336a3..b7e9eab 100644 --- a/DDWFHMX.cs +++ b/DDWFHMX.cs @@ -108,7 +108,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH * INTO {3} FROM GZ_DDWFHMX_TH - WHERE [未发货数量] <> 0 AND [未发货数量] > 0 + WHERE [未发货数量] <> 0 AND [未发货数量] <> 0 ORDER BY [日期] ", FstartDate, FEndDate, FSaleOrgId, tableName); DBUtils.Execute(this.Context, sql); diff --git a/GZ_LTHReportForms.csproj b/GZ_LTHReportForms.csproj index 8bfa4c7..a0e7c63 100644 --- a/GZ_LTHReportForms.csproj +++ b/GZ_LTHReportForms.csproj @@ -47,16 +47,16 @@ ..\..\GZ_LTHYJZZHTH\bin\Debug\Kingdee.BOS.DataEntity.dll - ..\..\派诺报表-裴豪\派诺报表\代码\Piolot_RepotForm\Pilot.Report.Exploitation\bin\Debug\NPOI.dll + ..\..\派诺裴豪-报表\派诺报表\代码\Pilot.Report\Pilot.Report\Pilot.Report.Exploitation\bin\Debug\NPOI.dll - ..\..\派诺报表-裴豪\派诺报表\代码\Piolot_RepotForm\Pilot.Report.Exploitation\bin\Debug\NPOI.OOXML.dll + ..\..\派诺裴豪-报表\派诺报表\代码\Pilot.Report\Pilot.Report\Pilot.Report.Exploitation\bin\Debug\NPOI.OOXML.dll - ..\..\派诺报表-裴豪\派诺报表\代码\Piolot_RepotForm\Pilot.Report.Exploitation\bin\Debug\NPOI.OpenXml4Net.dll + ..\..\派诺裴豪-报表\派诺报表\代码\Pilot.Report\Pilot.Report\Pilot.Report.Exploitation\bin\Debug\NPOI.OpenXml4Net.dll - ..\..\派诺报表-裴豪\派诺报表\代码\Piolot_RepotForm\Pilot.Report.Exploitation\bin\Debug\NPOI.OpenXmlFormats.dll + ..\..\派诺裴豪-报表\派诺报表\代码\Pilot.Report\Pilot.Report\Pilot.Report.Exploitation\bin\Debug\NPOI.OpenXmlFormats.dll diff --git a/YSKDZGongNeng_JY/LiteVersionPlugIn.cs b/YSKDZGongNeng_JY/LiteVersionPlugIn.cs index 8ea8c6b..04e19cd 100644 --- a/YSKDZGongNeng_JY/LiteVersionPlugIn.cs +++ b/YSKDZGongNeng_JY/LiteVersionPlugIn.cs @@ -29,10 +29,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivable public override void BarItemClick(BarItemClickEventArgs e) { base.BarItemClick(e); - // 判断 应收对账单【简易版】按钮 + // 判断 应收对账单【明细版】按钮 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)); @@ -67,7 +67,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable if (sqlTestList.Count() > 0) { Num = 1; - fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["FAmount"]),2); + fAmount = Math.Round(Convert.ToDecimal(sqlTestList[0]["FAmount"]), 2); fDate2 = sqlTestList[0]["FDate"].ToString().Split(' ')[0]; } @@ -78,11 +78,11 @@ namespace Pilot.Report.Exploitation.AccountsReceivable /// /// 赋值EXCEL /// - static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount,string fDate2, Kingdee.BOS.Context Context) + static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount, string fDate2, Kingdee.BOS.Context Context) { #region Excel代码 - string filePath = @"D:\KingdeeModel\对账单模板.xlsx"; + string filePath = @"D:\KingdeeModel\对账单模板2.xlsx"; FileStream file = new FileStream(filePath, FileMode.Open, FileAccess.Read); IWorkbook workbook = new XSSFWorkbook(file); file.Close(); @@ -219,44 +219,137 @@ namespace Pilot.Report.Exploitation.AccountsReceivable for (var i = 0; i < list.Count; i++) { string date = string.IsNullOrWhiteSpace(list[i]["DATE"].ToString()) ? "" : list[i]["DATE"].ToString().Split(' ')[0]; - decimal OrderAmount = Math.Round(Convert.ToDecimal(list[i]["OrderAmount"]), 2); - decimal ShipmentsAmount = Math.Round(Convert.ToDecimal(list[i]["ShipmentsAmount"]), 2); - decimal FBillAllAmount = Math.Round(Convert.ToDecimal(list[i]["FBillAllAmount"]), 2); - decimal OrdeFALLAMOUNTFORrAmount = Math.Round(Convert.ToDecimal(list[i]["FALLAMOUNTFOR"]), 2); - decimal PaymentAmount = Math.Round(Convert.ToDecimal(list[i]["PaymentAmount"]), 2); - decimal ShippedDebt = Math.Round(Convert.ToDecimal(list[i]["ShippedDebt"]), 2); - decimal InvoicedDebt = Math.Round(Convert.ToDecimal(list[i]["InvoicedDebt"]), 2); + string ShipmentsDate = string.IsNullOrWhiteSpace(list[i]["ShipmentsDate"].ToString()) ? "" : list[i]["ShipmentsDate"].ToString().Split(' ')[0]; + string PaymentDate = string.IsNullOrWhiteSpace(list[i]["PaymentDate"].ToString()) ? "" : list[i]["PaymentDate"].ToString().Split(' ')[0]; + string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : list[i]["ZPBillingDate"].ToString().Split(' ')[0]; + string ReturnDate = string.IsNullOrWhiteSpace(list[i]["ReturnDate"].ToString()) ? "" : list[i]["ReturnDate"].ToString().Split(' ')[0]; IRow rowi = sheet.CreateRow(13 + i); ICell c1 = rowi.CreateCell(0); c1.SetCellValue(list[i]["Number"].ToString()); c1.CellStyle = cellStyle; - ICell c2 = rowi.CreateCell(1); c2.SetCellValue(""+date+""); c2.CellStyle = cellStyle2; + ICell c2 = rowi.CreateCell(1); c2.SetCellValue("" + date + ""); c2.CellStyle = cellStyle2; ICell c3 = rowi.CreateCell(2); c3.SetCellValue(list[i]["CONTRACTNUMBER"].ToString()); c3.CellStyle = cellStyle2; ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["ProjectName"].ToString()); c4.CellStyle = cellStyle2; - ICell c5 = rowi.CreateCell(4); c5.SetCellValue(""+ OrderAmount + ""); c5.CellStyle = cellStyle; - ICell c6 = rowi.CreateCell(5); c6.SetCellValue("" + ShipmentsAmount + ""); c6.CellStyle = cellStyle; - ICell c7 = rowi.CreateCell(6); c7.SetCellValue("" + FBillAllAmount + ""); c7.CellStyle = cellStyle; - ICell c8 = rowi.CreateCell(7); c8.SetCellValue("" + OrdeFALLAMOUNTFORrAmount + ""); c8.CellStyle = cellStyle; - ICell c9 = rowi.CreateCell(8); c9.SetCellValue("" + PaymentAmount + ""); c9.CellStyle = cellStyle; - ICell c10 = rowi.CreateCell(9); c10.SetCellValue("" + ShippedDebt + ""); c10.CellStyle = cellStyle; - ICell c11 = rowi.CreateCell(10); c11.SetCellValue("" + InvoicedDebt + ""); c11.CellStyle = cellStyle; - ICell c12 = rowi.CreateCell(11); c12.SetCellValue(list[i]["IsEnded"].ToString()); c12.CellStyle = cellStyle; - ICell c13 = rowi.CreateCell(12); c13.SetCellValue(list[i]["Remark"].ToString()); c13.CellStyle = cellStyle2; - n++; - if(list[i]["Number"].ToString() == "合计") + ICell c5 = rowi.CreateCell(4); c5.SetCellValue(list[i]["SizeModel"].ToString()); c5.CellStyle = cellStyle2; + + ICell c6 = rowi.CreateCell(5); c6.SetCellValue(""); c6.CellStyle = cellStyle; //数量 + if (!string.IsNullOrWhiteSpace(list[i]["FQty"].ToString())) { - c1.CellStyle = style3; - c2.CellStyle = style3; - c3.CellStyle = style3; - c4.CellStyle = style3; - c5.CellStyle = style3; - c6.CellStyle = style3; - c7.CellStyle = style3; - c8.CellStyle = style3; - c9.CellStyle = style3; - c10.CellStyle = style3; - c11.CellStyle = style3; + int FQty = Convert.ToInt32(list[i]["FQty"]); + c6.SetCellValue("" + FQty + ""); c6.CellStyle = cellStyle; //数量 + } + + ICell c7 = rowi.CreateCell(6); c7.SetCellValue(""); c7.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["FTaxPrice"].ToString())) + { + decimal FTaxPrice = Math.Round(Convert.ToDecimal(list[i]["FTaxPrice"]), 2); + c7.SetCellValue("" + FTaxPrice + ""); c7.CellStyle = cellStyle; + } + + ICell c8 = rowi.CreateCell(7); c8.SetCellValue(""); c8.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["FAllAmount"].ToString())) + { + decimal FAllAmount = Math.Round(Convert.ToDecimal(list[i]["FAllAmount"]), 2); + c8.SetCellValue("" + FAllAmount + ""); c8.CellStyle = cellStyle; + } + + ICell c9 = rowi.CreateCell(8); c9.SetCellValue(""); c9.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["OrderAmount"].ToString())) + { + decimal OrderAmount = Math.Round(Convert.ToDecimal(list[i]["OrderAmount"]), 2); + c9.SetCellValue("" + OrderAmount + ""); c9.CellStyle = cellStyle; + + } + + ICell c11 = rowi.CreateCell(10); c11.SetCellValue(""); c11.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["ShipmentsNum"].ToString())) + { + int ShipmentsNum = Convert.ToInt32(list[i]["ShipmentsNum"]); + c11.SetCellValue("" + ShipmentsNum + ""); c11.CellStyle = cellStyle; + } + + ICell c12 = rowi.CreateCell(11); c12.SetCellValue(""); c12.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["ShipmentsAmount"].ToString())) + { + decimal ShipmentsAmount = Math.Round(Convert.ToDecimal(list[i]["ShipmentsAmount"]), 2); + c12.SetCellValue("" + ShipmentsAmount + ""); c12.CellStyle = cellStyle; + } + + ICell c14 = rowi.CreateCell(13); c14.SetCellValue(""); c14.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["ReturnNum"].ToString())) + { + int ReturnNum = Convert.ToInt32(list[i]["ReturnNum"]); + c14.SetCellValue("" + ReturnNum + ""); c14.CellStyle = cellStyle; + } + + ICell c15 = rowi.CreateCell(14); c15.SetCellValue(""); c15.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["ReturnAmount"].ToString())) + { + decimal ReturnAmount = Math.Round(Convert.ToDecimal(list[i]["ReturnAmount"]), 2); + c15.SetCellValue("" + ReturnAmount + ""); c15.CellStyle = cellStyle; + } + + ICell c19 = rowi.CreateCell(18); c19.SetCellValue(""); c19.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["PaymentAmount"].ToString())) + { + + decimal PaymentAmount = Math.Round(Convert.ToDecimal(list[i]["PaymentAmount"]), 2); + c19.SetCellValue("" + PaymentAmount + ""); c19.CellStyle = cellStyle; + } + + ICell c20 = rowi.CreateCell(19); c20.SetCellValue(""); c20.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["ShippedDebt"].ToString())) + { + decimal ShippedDebt = Math.Round(Convert.ToDecimal(list[i]["ShippedDebt"]), 2); + c20.SetCellValue("" + ShippedDebt + ""); c20.CellStyle = cellStyle; + } + + ICell c21 = rowi.CreateCell(20); c21.SetCellValue(""); c21.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["InvoicedDebt"].ToString())) + { + decimal InvoicedDebt = Math.Round(Convert.ToDecimal(list[i]["InvoicedDebt"]), 2); + c21.SetCellValue("" + InvoicedDebt + ""); c21.CellStyle = cellStyle; + } + + ICell c17 = rowi.CreateCell(16); c17.SetCellValue(""); c17.CellStyle = cellStyle; + if (!string.IsNullOrWhiteSpace(list[i]["BillingAmount"].ToString())) + { + + decimal BillingAmount = Math.Round(Convert.ToDecimal(list[i]["BillingAmount"]), 2); + c17.SetCellValue("" + BillingAmount + ""); c17.CellStyle = cellStyle; + } + + ICell c10 = rowi.CreateCell(9); c10.SetCellValue(ShipmentsDate); c10.CellStyle = cellStyle2;//发货日期 + ICell c13 = rowi.CreateCell(12); c13.SetCellValue(ReturnDate); c13.CellStyle = cellStyle2;//退货日期 + ICell c16 = rowi.CreateCell(15); c16.SetCellValue(BillingDate); c16.CellStyle = cellStyle2; //开票日期 + ICell c18 = rowi.CreateCell(17); c18.SetCellValue(PaymentDate); c18.CellStyle = cellStyle2;//回款日期 + ICell c22 = rowi.CreateCell(21); c22.SetCellValue(list[i]["IsEnded"].ToString()); c22.CellStyle = cellStyle2; + ICell c23 = rowi.CreateCell(22); c23.SetCellValue(list[i]["Remark"].ToString()); c23.CellStyle = cellStyle2; + n++; + if (list[i]["Number"].ToString() == "合计") + { + c1.CellStyle = style3; + c2.CellStyle = style3; + c3.CellStyle = style3; + c4.CellStyle = style3; + c5.CellStyle = style3; + c6.CellStyle = style3; + c7.CellStyle = style3; + c8.CellStyle = style3; + c9.CellStyle = style3; + c10.CellStyle = style3; + c11.CellStyle = style3; c12.CellStyle = style3; c13.CellStyle = style3; + c14.CellStyle = style3; + c15.CellStyle = style3; + c16.CellStyle = style3; + c17.CellStyle = style3; + c18.CellStyle = style3; + c19.CellStyle = style3; + c20.CellStyle = style3; + c21.CellStyle = style3; + c22.CellStyle = style3; + c23.CellStyle = style3; } } @@ -379,7 +472,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable } ICell CR1 = r5.CreateCell(i); CR1.SetCellValue(test1); - if (i >= 4) + if (i >= 4) { CR1.CellStyle = style2; } diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs index 1929231..9017d5b 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs @@ -81,7 +81,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements header.AddChild("PaymentAmount", new LocaleValue("回款金额"), SqlStorageType.SqlDecimal); header.AddChild("ShippedDebt", new LocaleValue("已出货欠款"), SqlStorageType.SqlDecimal); header.AddChild("InvoicedDebt", new LocaleValue("已开票欠款"), SqlStorageType.SqlDecimal); - header.AddChild("OwedTickets", new LocaleValue("欠票"), SqlStorageType.Sqlvarchar); + header.AddChild("OwedTickets", new LocaleValue("欠票"), SqlStorageType.SqlDecimal); header.AddChild("IsEnded", new LocaleValue("是否已完结"), SqlStorageType.Sqlvarchar); header.AddChild("Remark", new LocaleValue("备注"), SqlStorageType.Sqlvarchar); @@ -100,7 +100,9 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements public override void BuilderReportSqlAndTempTable(IRptParams filter, string tableName) { DynamicObject customFilter = filter.FilterParameter.CustomFilter; - + //组织 + var ZZ = (customFilter["F_VRYF_OrgId_re5"] as DynamicObject); + var ZZFID = ZZ["Id"]?.ToString(); // 客户 string fClient = customFilter["FClient_Id"]?.ToString(); // 工程项目名称 @@ -115,163 +117,50 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements var fGROUP = customFilter["F_ALL_GROUP"]?.ToString(); //纸质合同号 - var ZZHTH = customFilter["F_ZZHTH"].ToString(); + var ZZHTH = customFilter["F_ZZHTH"]?.ToString(); //销售员 - var XSYFID = (customFilter["F_XSY"] as DynamicObject)["Id"].ToString(); + var XSY = (customFilter["F_XSY"] as DynamicObject); + var XSYFID = string.Empty; + if (XSY != null) + { + XSYFID = XSY["Id"].ToString(); + } var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList)); base.BuilderReportSqlAndTempTable(filter, tableName); string sql = string.Format(@"/*dialect*/ - Select * INTO #TABLEXYX From - (Select A.FID From View_Table_Temp2 A JOIN View_Table_Temp3 B - on A.FCONTRACTNUMBER=B.FCONTRACTNUMBER AND A.FCREATEDATE = B.FCREATEDATE - UNION ALL - Select * From View_Table_Temp1) W - Select - CAST(ROW_NUMBER() OVER (ORDER BY A.FDate DESC) as nvarchar(MAX)) AS 'Number', - A.FDate as 'DATE', --签订日期 - A.F_CONTRACTNUMBER as 'CONTRACTNUMBER', --订单号 - ISNULL(H.FNAME,'') as 'ProjectName', --项目名称 - ISNULL(AA.FBillAllAmount_LC,0) as 'OrderAmount', --订单金额 - ISNULL(H2.FALLAMOUNT,0) as 'ShipmentsAmount', --发货金额 - ISNULL(H3.FBillAllAmount,0) as 'FBillAllAmount', --退货金额 - ISNULL(H4.FALLAMOUNTFOR,0) as 'FALLAMOUNTFOR', --开票金额 - ISNULL(A.F_AMOUNT,0) as 'PaymentAmount', --回款金额 - ISNULL(H2.FALLAMOUNT,0)-ISNULL(H3.FBillAllAmount,0) -ISNULL(H6.FWRITTENOFFAMOUNTFOR,0) as 'ShippedDebt', --已出货欠款 - ISNULL(H4.FALLAMOUNTFOR,0) -ISNULL(H6.FWRITTENOFFAMOUNTFOR,0) as 'InvoicedDebt', --已开票欠款 - ISNULL((ISNULL(H2.FALLAMOUNT,0)-ISNULL(H3.FBillAllAmount,0) -0)-(ISNULL(H4.FALLAMOUNTFOR,0) -0),0) as 'OwedTickets', --欠票 - CASE WHEN (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H2.FALLAMOUNT,0) - AND (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H4.FALLAMOUNTFOR,0) - AND (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H5.FREALRECAMOUNTFOR,0) - THEN '已完结' - ELSE '未完结' - END as 'IsEnded', --是否已完结 - A.FNOTE as 'Remark' --备注 - INTO #TEMPTABLE1 --临时表 - From - T_SAL_ORDER A - JOIN - T_SAL_ORDERFIN AA - on A.FID = AA.FID - LEFT JOIN - (Select q2.FNAME,q1.* From - T_BAS_PREBDONE q1 - JOIN - T_BAS_PREBDONE_L q2 - on q1.FID = q2.FID - Where q2.FLocaleID = 2052 - AND q1.FDocumentStatus = 'C' - AND q1.FForbidStatus = 'A') H --工程项目表（预置基础资料1） - on H.FID = A.F_projectname - LEFT JOIN - (SELECT W2.FSBILLID,SUM(W1.FALLAMOUNT) as 'FALLAMOUNT' FROM - (Select q2.FAllAmount,q2.FENTRYID From T_SAL_DELIVERYNOTICE q1 - JOIN T_SAL_DELIVERYNOTICEENTRY_F q2 - on q1.FID = q2.FID Where q1.FDocumentStatus = 'C' - AND q1.FCancelStatus = 'A') W1 - JOIN T_SAL_DELIVERYNOTICEENTRY_LK W2 on W1.FENTRYID = W2.FENTRYID - Where W2.FSTABLENAME = 'T_SAL_ORDERENTRY' GROUP BY W2.FSBILLID) H2 --发货通知单 - on A.FID = H2.FSBILLID - LEFT JOIN - (SELECT A1.FSBILLID,SUM(A2.FRetNoticeQty*A3.FTaxPrice) as 'FBillAllAmount' FROM - (SELECT W2.FSBILLID,W1.FENTRYID FROM - (Select q1.* From - T_SAL_ORDERENTRY q1 - JOIN - T_SAL_ORDER q2 - on q1.FID = q2.FID - Where q2.FBusinessType = 'RETURNSO' - AND q2.FDocumentStatus = 'C') W1 - JOIN T_SAL_ORDERENTRY_LK W2 on W1.FENTRYID = W2.FENTRYID) A1 - JOIN T_SAL_ORDERENTRY_R A2 on A1.FENTRYID = A2.FENTRYID JOIN - T_SAL_ORDERENTRY_F A3 on A2.FENTRYID = A3.FENTRYID GROUP BY A1.FSBILLID) H3 --销售订单（退货） - on A.FID = H3.FSBILLID - LEFT JOIN - (SELECT W2.FSBILLID,SUM(W1.FALLAMOUNTFOR) as 'FALLAMOUNTFOR' FROM - (Select B.FALLAMOUNTFOR,B.FENTRYID From T_AR_RECEIVABLE A - JOIN T_AR_RECEIVABLEENTRY B on A.FID = B.FID Where A.FDocumentStatus = 'C' - AND B.FORDERNUMBER !='' AND A.F_GeneralInvoice != 'Y') W1 - JOIN T_AR_RECEIVABLEENTRY_LK W2 on W1.FENTRYID = W2.FENTRYID - Where W2.FSTABLENAME = 'T_SAL_ORDERENTRY' GROUP BY W2.FSBILLID) H4 --应收单表 - on A.FID = H4.FSBILLID - LEFT JOIN - (Select q2.FSALEORDERNO,SUM(q1.FREALRECAMOUNTFOR) as 'FREALRECAMOUNTFOR' From T_AR_RECEIVEBILL q1 - JOIN T_AR_RECEIVEBILLENTRY q2 on q1.FID = q2.FID Where q1.FDOCUMENTSTATUS = 'C' - AND q1.FCancelStatus = 'A' AND q2.FSALEORDERNO != '' GROUP BY q2.FSALEORDERNO) H5 --收款单表 - on A.FBILLNO = H5.FSALEORDERNO - LEFT JOIN - (Select a1.FID,a1.F_CONTRACTNUMBER,SUM(a2.FWRITTENOFFAMOUNTFOR) as 'FWRITTENOFFAMOUNTFOR' From T_AR_RECEIVEBILL a1 JOIN T_AR_RECEIVEBILLENTRY a2 on a1.FID = a2.FID - WHere a1.F_CONTRACTNUMBER!='' GROUP BY a1.FID,a1.F_CONTRACTNUMBER) H6 - on H6.F_CONTRACTNUMBER = A.F_CONTRACTNUMBER - Where A.FDocumentStatus = 'C' AND A.FBusinessType = 'NORMAL' AND A.FID in (Select * From #TABLEXYX)"); + --更新MX表中的字段 + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}' + + --更新MX表中的发票金额 + EXEC GXFPJEYSDZDMX_GZTH + + --更新JY表 + EXEC UpdateYSDZBJY_GZTH - if (!string.IsNullOrEmpty(fClient) && fClient != "0") + 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 A.FCustId in ({0})", fClient); + sql += string.Format(@"AND FSalerId = '{0}'",XSYFID); } - if (!string.IsNullOrEmpty(fProject)) + if (fGROUP == "2") { - sql += string.Format(@" AND A.F_projectname in ({0})", fProject); - } - if (!string.IsNullOrEmpty(fDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE <= EOMONTH('{0}')", fDate); - } - if (!string.IsNullOrEmpty(FSDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE >= EOMONTH('{0}')", FSDate); + sql += string.Format(@"AND IsEnded = '未完结'"); } if (!string.IsNullOrEmpty(ZZHTH)) { - sql += string.Format(@"AND A.F_contractnumber = '{0}'", ZZHTH); + sql += string.Format(@"AND ContractNumber = '{0}'", ZZHTH); } - if (!string.IsNullOrEmpty(XSYFID)) - { - sql += string.Format(@"AND A.FSalerId = '{0}'",XSYFID); - } - sql += string.Format(@";"); - - sql += string.Format(@"/*dialect*/ - Select * INTO #TEMPTABLE2 From #TEMPTABLE1 - Where 1=1"); - - if (!string.IsNullOrEmpty(fGROUP) && fGROUP == "2") - { - sql += string.Format(@" AND IsEnded = '否'"); - } - - sql += string.Format(@";"); - - sql += string.Format(@"/*dialect*/ - Select * INTO #TEMPTABLE3 From - #TEMPTABLE1"); - - sql += string.Format(@"/*dialect*/ - --清空表数据 - TRUNCATE TABLE YingShouZhanKuanJY - - INSERT INTO YingShouZhanKuanJY(Number,[Date],ContractNumber,ProjectName,OrderAmount,ShipmentsAmount, - FBillAllAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark) - SELECT * - FROM #TEMPTABLE3"); - - sql += string.Format(@"/*dialect*/ - EXEC UpdateYSDZBJY_GZTH"); - - sql += string.Format(@"/*dialect*/ - Select - *, - ROW_NUMBER() OVER (ORDER BY Date DESC) AS FID, - ROW_NUMBER() OVER (ORDER BY Date DESC) AS FIDENTITYID - INTO {0} - From - YingShouZhanKuanJY - ORDER BY [ContractNumber] - ", tableName); - DBUtils.Execute(this.Context, sql); } @@ -300,7 +189,12 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements //纸质合同号 var ZZHTH = customFilter["F_ZZHTH"]?.ToString(); //销售员 - var XSYFID = (customFilter["F_XSY"] as DynamicObject)["Id"].ToString(); + var XSY = (customFilter["F_XSY"] as DynamicObject); + var XSYFID = string.Empty; + if (XSY != null) + { + XSYFID = XSY["Id"].ToString(); + } string fState = ""; if (fGROUP == "1") diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs index 170b9f0..3eaec80 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs @@ -67,7 +67,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements ReportHeader header = new ReportHeader(); - header.AddChild("DATE", new LocaleValue("签订日期"), SqlStorageType.SqlDatetime); + header.AddChild("DATE", new LocaleValue("签订日期"), SqlStorageType.Sqlvarchar); header.AddChild("CONTRACTNUMBER", new LocaleValue("订单号"), SqlStorageType.Sqlvarchar); header.AddChild("ProjectName", new LocaleValue("项目名称"), SqlStorageType.Sqlvarchar); header.AddChild("SizeModel", new LocaleValue("规格型号"), SqlStorageType.Sqlvarchar); @@ -110,6 +110,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements { DynamicObject customFilter = filter.FilterParameter.CustomFilter; + //组织 + var ZZ = (customFilter["F_VRYF_OrgId_re5"] as DynamicObject); + var ZZFID = ZZ["Id"]?.ToString(); + // 客户 string fClient = customFilter["FClient_Id"]?.ToString(); // 工程项目名称 @@ -122,214 +126,53 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements var FSDate = customFilter["FSDate"]?.ToString(); //纸质合同号 - var ZZHTH = customFilter["F_ZZHTH"].ToString(); + var ZZHTH = customFilter["F_ZZHTH"]?.ToString(); //销售员 - var XSYFID = (customFilter["F_XSY"] as DynamicObject)["Id"].ToString(); + var XSY = customFilter["F_XSY"] as DynamicObject; + var XSYFID = string.Empty; + if (XSY != null) + { + XSYFID = XSY["Id"]?.ToString(); + } + var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList)); base.BuilderReportSqlAndTempTable(filter, tableName); string sql = string.Format(@"/*dialect*/ - Select * INTO #TABLEXYX From - (Select A.FID From View_Table_Temp2 A JOIN View_Table_Temp3 B - on A.FCONTRACTNUMBER=B.FCONTRACTNUMBER AND A.FCREATEDATE = B.FCREATEDATE - UNION ALL - Select * From View_Table_Temp1) W - Select - A.FDATE, - CAST(ROW_NUMBER() OVER (ORDER BY A.FDate DESC) as nvarchar(MAX)) AS Number, - CASE WHEN B.FSEQ != 1 THEN null - ELSE A.FDate END as 'DATE', --签订日期 - CASE WHEN B.FSEQ != 1 THEN '' - ELSE A.F_CONTRACTNUMBER END as 'CONTRACTNUMBER', --订单号 - CASE WHEN B.FSEQ != 1 THEN '' - ELSE ISNULL(H.FNAME,'') END as 'ProjectName', --项目名称 - ISNULL(G.FSpecification,'') as 'SizeModel', --规格型号 - B.FQty, --数量/台 - B2.FTaxPrice, --单价 - B2.FAllAmount_LC, --价税合计 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(A2.FBILLALLAMOUNT,0) END as 'OrderAmount', --订单金额 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H2.FDate,'') END as 'ShipmentsDate', --发货日期 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H2.FPRICEBASEQTY,0) END as 'ShipmentsNum', --发货数量 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H2.FALLAMOUNT,0) END as 'ShipmentsAmount', --发货金额 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H3.FDate,'') END as 'ReturnDate', --退货日期 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H3.FRETNOTICEQTY,0) END as 'ReturnNum', --退货数量 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H3.FBillAllAmount,0) END as 'ReturnAmount',--退货金额 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H4.FDate,'') END as 'BillingDate', --开票日期 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H4.FALLAMOUNTFOR,0) END as 'BillingAmount', --开票金额 - CASE WHEN B.FSEQ != 1 THEN null - ELSE (Select STRING_AGG((CONVERT(nvarchar,aa1.FDATE,23)),',') as 'FDate' - From T_AR_RECEIVEBILL aa1 JOIN T_SEC_USER aa2 on aa1.FCREATORID = aa2.FUSERID - Where FBILLNO in (Select FBILLNO3 From T_AutoWrireRecordEntry a1 JOIN T_AutoWrireRecordEntry2 a2 - on a1.FID = a2.FID Where FBILLNO2 = A.FBILLNO)) - END as 'PaymentDate', --回款日期 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(A.F_AMOUNT,0) END as 'PaymentAmount', --回款金额 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H2.FALLAMOUNT,0)-ISNULL(H3.FBillAllAmount,0) -ISNULL(E.FWRITTENOFFAMOUNTFOR,0) END as 'ShippedDebt', --已出货欠款 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL(H4.FALLAMOUNTFOR,0) -ISNULL(E.FWRITTENOFFAMOUNTFOR,0) END as 'InvoicedDebt', --已开票欠款 - CASE WHEN B.FSEQ != 1 THEN null - ELSE ISNULL((ISNULL(H2.FALLAMOUNT,0)-ISNULL(H3.FBillAllAmount,0) -0)-(ISNULL(H4.FALLAMOUNTFOR,0) -0),0) - END as 'OwedTickets', --欠票 - CASE WHEN B.FSEQ != 1 THEN '' - WHEN (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H2.FALLAMOUNT,0) --订单金额-退货金额 = 发货金额 - AND (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H4.FALLAMOUNTFOR,0) --订单金额-退货金额 = 开票金额 - AND (ISNULL(AA.FBillAllAmount,0)-ISNULL(H3.FBillAllAmount,0)) = ISNULL(H5.FREALRECAMOUNTFOR,0) --订单金额-退货金额 = 收款金额 - THEN '已完结' - ELSE '未完结' - END as 'IsEnded', --是否已完结 - CASE WHEN B.FSEQ != 1 THEN '' - ELSE A.FNOTE END as 'Remark' --备注 - INTO #TEMPTABLE1 --临时表 - From - T_SAL_ORDER A - JOIN - T_SAL_ORDERFIN AA - on A.FID = AA.FID - JOIN - T_SAL_ORDERFIN A2 - on A.FID = A2.FID - JOIN - T_SAL_ORDERENTRY B - on A.FID = B.FID - JOIN - T_SAL_ORDERENTRY_F B2 - on B.FENTRYID = B2.FENTRYID - LEFT JOIN - (Select q2.FNAME,q1.* From - T_BAS_PREBDONE q1 - JOIN - T_BAS_PREBDONE_L q2 - on q1.FID = q2.FID - Where q2.FLocaleID = 2052 - AND q1.FDocumentStatus = 'C' - AND q1.FForbidStatus = 'A') H --工程项目表（预置基础资料1） - on H.FID = A.F_projectname - LEFT JOIN - (SELECT W2.FSBILLID,SUM(W1.FALLAMOUNT) as 'FALLAMOUNT',SUM(W1.FPRICEBASEQTY) as 'FPRICEBASEQTY', - STRING_AGG(CONVERT(nvarchar,W1.FDATE, 23), ',') as 'FDate' FROM - (Select q2.FAllAmount,q2.FENTRYID,q2.FPriceBaseQty,q1.FDate From T_SAL_DELIVERYNOTICE q1 - JOIN T_SAL_DELIVERYNOTICEENTRY_F q2 - on q1.FID = q2.FID Where q1.FDocumentStatus = 'C' - AND q1.FCancelStatus = 'A') W1 - JOIN T_SAL_DELIVERYNOTICEENTRY_LK W2 on W1.FENTRYID = W2.FENTRYID - Where W2.FSTABLENAME = 'T_SAL_ORDERENTRY' GROUP BY W2.FSBILLID) H2 --发货通知单表 - on A.FID = H2.FSBILLID - LEFT JOIN - (SELECT W2.FSBILLID,STRING_AGG(CONVERT(nvarchar,W1.FDATE, 23), ',') as 'FDate',SUM(W1.FPriceUnitQty) as 'FRETNOTICEQTY',SUM(W1.FALLAMOUNT) as 'FBillAllAmount' FROM - (Select q1.FDATE,q3.FSID,q2.FAllAmount,q2.FPriceUnitQty From T_SAL_RETURNNOTICE q1 JOIN T_SAL_RETURNNOTICEENTRY_F q2 - on q1.FID = q2.FID JOIN T_SAL_RETURNNOTICEENTRY_LK q3 on q2.FENTRYID = q3.FENTRYID - Where q1.FDocumentStatus = 'C' AND q1.FCancelStatus = 'A' AND q3.FSTABLENAME = 'T_SAL_ORDERENTRY') W1 - JOIN T_SAL_ORDERENTRY_LK W2 on W1.FSID = W2.FENTRYID GROUP BY W2.FSBILLID) H3 --退货订单表 - on A.FID = H3.FSBILLID - LEFT JOIN - (SELECT W2.FSBILLID,SUM(W1.FALLAMOUNTFOR) as 'FALLAMOUNTFOR',STRING_AGG(CONVERT(nvarchar,W1.FDATE,23),',') as 'FDate' FROM - (Select B.FALLAMOUNTFOR,B.FENTRYID,B.FOPENAMOUNTFOR,A.FDATE From T_AR_RECEIVABLE A - JOIN T_AR_RECEIVABLEENTRY B on A.FID = B.FID Where A.FDocumentStatus = 'C' - AND B.FORDERNUMBER !='' AND A.F_GeneralInvoice != 'Y') W1 - JOIN T_AR_RECEIVABLEENTRY_LK W2 on W1.FENTRYID = W2.FENTRYID - Where W2.FSTABLENAME = 'T_SAL_ORDERENTRY' GROUP BY W2.FSBILLID) H4 --应收单表 - on A.FID = H4.FSBILLID - LEFT JOIN - (Select q2.FSALEORDERNO,SUM(q1.FREALRECAMOUNTFOR) as 'FREALRECAMOUNTFOR' From T_AR_RECEIVEBILL q1 - JOIN T_AR_RECEIVEBILLENTRY q2 on q1.FID = q2.FID Where q1.FDOCUMENTSTATUS = 'C' - AND q1.FCancelStatus = 'A' AND q2.FSALEORDERNO != '' GROUP BY q2.FSALEORDERNO) H5 --收款单表 - on A.FBILLNO = H5.FSALEORDERNO - LEFT JOIN - (Select B.FNAME,B.FSPECIFICATION,A.* From - T_BD_MATERIAL A - JOIN - T_BD_MATERIAL_L B - on A.FMATERIALID = B.FMATERIALID - Where B.FLOCALEID = 2052 - AND A.FDocumentStatus = 'C' AND A.FForbidStatus = 'A') G --物料表 - on G.FMATERIALID = B.FMaterialId - LEFT JOIN - (Select a1.FID,a1.F_CONTRACTNUMBER,STRING_AGG(CONVERT(nvarchar,a1.FDATE, 23), ',') as 'FDate',SUM(a2.FWRITTENOFFAMOUNTFOR) as 'FWRITTENOFFAMOUNTFOR' - From T_AR_RECEIVEBILL a1 JOIN T_AR_RECEIVEBILLENTRY a2 on a1.FID = a2.FID - WHere a1.F_CONTRACTNUMBER!='' GROUP BY a1.FID,a1.F_CONTRACTNUMBER) E on E.F_CONTRACTNUMBER = A.F_CONTRACTNUMBER - Where A.FDocumentStatus = 'C' AND A.FBusinessType = 'NORMAL' AND A.FID in (Select * From #TABLEXYX)"); - - if (!string.IsNullOrEmpty(fClient) && fClient != "0") + --更新表中的字段 + EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}' + + --更新表中的发票金额 + 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 A.FCustId in ({0})", fClient); + sql += string.Format("AND FSalerId = '{0}'",XSYFID); } - if (!string.IsNullOrEmpty(fProject)) + if(fGROUP == "2") { - sql += string.Format(@" AND A.F_projectname in ({0})", fProject); - } - if (!string.IsNullOrEmpty(fDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE <= EOMONTH('{0}')", fDate); - } - if (!string.IsNullOrEmpty(FSDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE >= EOMONTH('{0}')", FSDate); + sql += string.Format("AND FID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH WHERE IsEnded = '未完结')"); } if (!string.IsNullOrEmpty(ZZHTH)) { - sql += string.Format(@"AND A.F_contractnumber = '{0}'", ZZHTH); + sql += string.Format(@"AND ContractNumber = '{0}'", ZZHTH); } - if (!string.IsNullOrEmpty(XSYFID)) - { - sql += string.Format(@"AND A.FSalerId = '{0}'", XSYFID); - } - - sql += string.Format(@";"); - - sql += string.Format(@"/*dialect*/ - Select * INTO #TEMPTABLE2 From #TEMPTABLE1 - Where 1=1"); - - if (!string.IsNullOrEmpty(fGROUP) && fGROUP == "2") - { - sql += string.Format(@" AND IsEnded = '否'"); - } - - sql += string.Format(@";"); - - sql += string.Format(@" - TRUNCATE TABLE YingShouZhanKuanMX - - INSERT INTO YingShouZhanKuanMX([DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,ShipmentsDate,ShipmentsNum, - ShipmentsAmount,ReturnDate,ReturnNum,ReturnAmount,PaymentDate,PaymentAmount,OwedTickets,IsEnded,Remark) - SELECT [DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount_LC,OrderAmount,ShipmentsDate,ShipmentsNum, - ShipmentsAmount,ReturnDate,ReturnNum,ReturnAmount,PaymentDate,PaymentAmount,OwedTickets,IsEnded,Remark - From #TEMPTABLE2 - - EXEC UpdateYSDZBMX_GZTH - "); - - sql += string.Format(@"/*dialect*/ - Select - *, - ROW_NUMBER() OVER (ORDER BY [DATE] DESC) AS FID, - ROW_NUMBER() OVER (ORDER BY [DATE] DESC) AS FIDENTITYID - INTO {0} - From - YingShouZhanKuanMX - ORDERY BY CONTRACTNUMBER - ", tableName); - DBUtils.Execute(this.Context, sql); } /// /// 获取前端组件转换过滤条件 /// - /// /// public override ReportTitles GetReportTitles(IRptParams filter) { @@ -351,7 +194,13 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements //纸质合同号 var ZZHTH = customFilter["F_ZZHTH"]?.ToString(); //销售员 - var XSYFID = (customFilter["F_XSY"] as DynamicObject)["Id"].ToString(); + var XSY = (customFilter["F_XSY"] as DynamicObject); + var XSYFID = string.Empty; + if (XSY != null) + { + XSYFID = XSY["Id"].ToString(); + } + string fState = ""; if (fGROUP == "1") diff --git a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs index 2fda297..d27781d 100644 --- a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs +++ b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs @@ -223,7 +223,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable string date = string.IsNullOrWhiteSpace(list[i]["DATE"].ToString()) ? "" : list[i]["DATE"].ToString().Split(' ')[0]; string ShipmentsDate = string.IsNullOrWhiteSpace(list[i]["ShipmentsDate"].ToString()) ? "" : list[i]["ShipmentsDate"].ToString().Split(' ')[0]; string PaymentDate = string.IsNullOrWhiteSpace(list[i]["PaymentDate"].ToString()) ? "" : list[i]["PaymentDate"].ToString().Split(' ')[0]; - string BillingDate = string.IsNullOrWhiteSpace(list[i]["BillingDate"].ToString()) ? "" : list[i]["BillingDate"].ToString().Split(' ')[0]; + string BillingDate = string.IsNullOrWhiteSpace(list[i]["ZPBillingDate"].ToString()) ? "" : list[i]["ZPBillingDate"].ToString().Split(' ')[0]; string ReturnDate = string.IsNullOrWhiteSpace(list[i]["ReturnDate"].ToString()) ? "" : list[i]["ReturnDate"].ToString().Split(' ')[0]; IRow rowi = sheet.CreateRow(13 + i); diff --git a/bin/Debug/GZ_LTHReportForms.dll b/bin/Debug/GZ_LTHReportForms.dll index ea1aa6a..cc5167c 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 ac1117b..4dbb161 100644 Binary files a/bin/Debug/GZ_LTHReportForms.pdb and b/bin/Debug/GZ_LTHReportForms.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8317666..f4b550c 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache b/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache index 113128d..af49951 100644 Binary files a/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache and b/obj/Debug/GZ_LTHReportForms.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache b/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache index 9f66700..21e0b35 100644 --- a/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache +++ b/obj/Debug/GZ_LTHReportForms.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -485ba4251bd67bbf5c82fe5d4c8e804b5e456cc501b3922621c2c781cec8871d +dc8cc2530cef14af163e419831cdd5d64097c566dd14e77532de8cff402d3de7 diff --git a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt index 6de68ad..e4883a4 100644 --- a/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt +++ b/obj/Debug/GZ_LTHReportForms.csproj.FileListAbsolute.txt @@ -30,3 +30,4 @@ E:\GZC#Code\派诺\PiolotTH_ReportFrom\obj\Debug\GZ_LTHReportForms.csproj.CoreCo 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 diff --git a/obj/Debug/GZ_LTHReportForms.dll b/obj/Debug/GZ_LTHReportForms.dll index ea1aa6a..cc5167c 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 ac1117b..4dbb161 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 new file mode 100644 index 0000000..7169a03 --- /dev/null +++ b/派诺报表SQL文件/应收对账单取发票金额(创建).sql @@ -0,0 +1,27 @@ + +--ַƱ +CREATE TABLE FPYSDZDMX ( + XSDDFID VARCHAR(500), + XSDDFENTRYID VARCHAR(500), + FPLX VARCHAR(500), + FPJSZZ VARCHAR(500), + FPRQ VARCHAR(500), + FPFID DECIMAL(23, 10), + FPFENTRYID DECIMAL(23, 10), + KPJE DECIMAL(23, 10), + ISTrue DECIMAL(23, 10) +); + +--DROP TABLE FPYSDZDMX + + + +--ַƱ +CREATE TABLE FPYSDZDHPMXHP ( + HZFPFID VARCHAR(500), + LZFPFID VARCHAR(500), + LZFPFENTRYID VARCHAR(500), + HZKPJE DECIMAL(23, 10), +); + +--DROP TABLE FPYSDZDHPMXHP \ No newline at end of file diff --git a/派诺报表SQL文件/应收对账单明细更新发票金额.sql b/派诺报表SQL文件/应收对账单明细更新发票金额.sql new file mode 100644 index 0000000..a7bdeba --- /dev/null +++ b/派诺报表SQL文件/应收对账单明细更新发票金额.sql @@ -0,0 +1,114 @@ +ALTER PROCEDURE GXFPJEYSDZDMX_GZTH + +AS +BEGIN + --·Ʊ + EXEC GetIV_SALESICYSMX_GZTH + + UPDATE A + SET PPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd'), + PPBillingAmount = B.KPJE + FROM YingShouZhanKuanMX A + INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ + WHERE B.FPLX = 'Ʊ' + + UPDATE A + SET ZPBillingDate = FORMAT(CONVERT(DATE, B.FPRQ), 'yyyy-MM-dd'),ZPBillingAmount = B.KPJE + FROM YingShouZhanKuanMX A + INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ + WHERE B.FPLX = 'רƱ' + + --ڳרƱ + update A + SET A.QCZPBillingAmount = ISNULL(A.QCZPBillingAmount,0) + B.FAFTERTOTALTAXFOR + FROM YingShouZhanKuanMX A + CROSS APPLY + (SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR + FROM T_IV_SALESIC + WHERE F_PAPERNUMBER = A.CONTRACTNUMBER + AND FBILLTYPEID = '50ea4e69b6144f69961d2e9b44820929' + AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) + ) B + + --ڳƱ + update A + SET A.QCPPBillingAmount = ISNULL(A.QCPPBillingAmount,0)+ B.FAFTERTOTALTAXFOR + FROM YingShouZhanKuanMX A + CROSS APPLY + (SELECT SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR + FROM T_IV_SALESIC + WHERE F_PAPERNUMBER = A.CONTRACTNUMBER + AND FBILLTYPEID = '1cab58bc33d24e27826be02249f4edac' + AND FID NOT IN (SELECT FPFID FROM FPYSDZDMX) + ) B + + --ƱƺƱĿƱ + UPDATE A + SET A.KPJE = B.HZKPJE, A.ISTrue = 1 + FROM FPYSDZDMX A + INNER JOIN FPYSDZDHPMXHP B ON A.FPFID = B.LZFPFID AND A.FPFENTRYID = B.LZFPFENTRYID + + UPDATE A + SET PPBillingAmount = PPBillingAmount + B.KPJE + FROM YingShouZhanKuanMX A + INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ + WHERE B.FPLX = 'Ʊ' AND B.ISTrue = 1 + + UPDATE A + SET ZPBillingAmount = ZPBillingAmount+ B.KPJE + FROM YingShouZhanKuanMX A + INNER JOIN FPYSDZDMX B ON A.FID = B.XSDDFID AND A.FENTRYID = B.XSDDFENTRYID AND A.FSaleOrgId = B.FPJSZZ + WHERE B.FPLX = 'רƱ' AND B.ISTrue = 1 + + --ƱڳƱֵֵеĿƱ + + SELECT + A.FID, + SUM(ISNULL(A.ZPBillingAmount,0)) + SUM(ISNULL(A.PPBillingAmount,0)) + AVG(ISNULL(A.QCZPBillingAmount,0)) + AVG(ISNULL(A.QCPPBillingAmount,0)) AS 'רƱ' + INTO #TEMP3 + FROM YingShouZhanKuanMX A + GROUP BY A.FID + + + UPDATE A + SET A.BillingAmount = B.[רƱ] + FROM YingShouZhanKuanMX A + INNER JOIN #TEMP3 B ON A.FID = B.FID + + --ѳǷѿƱǷǷƱǷֶ + SELECT + FID, SUM(ShipmentsAmount) - AVG(PaymentAmount) AS 'ѳǷ',AVG(BillingAmount) - AVG(PaymentAmount) AS 'ѿƱǷ',AVG(OrderAmount) - AVG(BillingAmount) AS 'ǷƱ', + CASE WHEN (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = SUM(ISNULL(ShipmentsAmount,0)) + AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(BillingAmount,0)) + AND (AVG(ISNULL(OrderAmount,0)) - SUM(ISNULL(ReturnAmount,0))) = AVG(ISNULL(PaymentAmount,0)) + THEN '' + ELSE 'δ' + END AS 'Ƿ' + INTO #TEMP4 + FROM YingShouZhanKuanMX + GROUP BY FID + + UPDATE A + SET A.ShippedDebt = B.[ѳǷ], A.InvoicedDebt = B.[ѿƱǷ],A.OwedTickets = B.[ǷƱ], + A.IsEnded = B.[Ƿ] + FROM YingShouZhanKuanMX A + INNER JOIN #TEMP4 B ON A.FID = B.FID + + --Աеݽе + SELECT + *, + ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) as row_num + INTO #TEMP5 + FROM YingShouZhanKuanMX + + TRUNCATE TABLE YingShouZhanKuanMX_GZTH + + INSERT INTO YingShouZhanKuanMX_GZTH + SELECT * FROM #TEMP5 + + UPDATE A + SET A.BillingAmount = 0,A.OrderAmount = 0,A.PaymentAmount = 0,A.ShippedDebt = 0,A.InvoicedDebt = 0,A.OwedTickets = 0,A.IsEnded = '' + FROM YingShouZhanKuanMX_GZTH A + WHERE row_num <> 1 + +END \ No newline at end of file diff --git a/派诺报表SQL文件/应收对账表(明细创建).sql b/派诺报表SQL文件/应收对账表(明细创建).sql index 41bbb09..a41bbe3 100644 --- a/派诺报表SQL文件/应收对账表(明细创建).sql +++ b/派诺报表SQL文件/应收对账表(明细创建).sql @@ -1,41 +1,89 @@ -CREATE PROCEDURE UpdateYSDZBMX_GZTH +ALTER PROCEDURE UpdateYSDZBMX_GZTH +@FSDATE varchar(1000), +@FEDATE varchar(1000), +@FSaleOrgId varchar(1000), +@FCUSTID varchar(1000) AS BEGIN ---ֵ˰Ʊѯ -SELECT B.CONTRACTNUMBER AS '',SUM(A.FAFTERTOTALTAX) AS '˰ϼƱλ',A.FDATE AS 'רƱ' -INTO #TEMP1 -FROM T_IV_SALESIC A -INNER JOIN YingShouZhanKuanMX B ON A.F_PaperNumber = B.CONTRACTNUMBER -WHERE A.FDOCUMENTSTATUS = 'C' -AND A.FBillTypeID = '50ea4e69b6144f69961d2e9b44820929' -GROUP BY B.CONTRACTNUMBER,A.FDATE + DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); + DECLARE @EndDate DATE = CONVERT(DATE, @FEDATE); + + -- һ + SET @EndDate = DATEADD(DAY, 1, @EndDate); ---Ʊѯ -SELECT B.CONTRACTNUMBER AS '',SUM(A.FAFTERTOTALTAX) AS '˰ϼƱλ',A.FDATE AS 'Ʊ' -INTO #TEMP2 -FROM T_IV_SALESIC A -INNER JOIN YingShouZhanKuanMX B ON A.F_PaperNumber = B.CONTRACTNUMBER -WHERE A.FDOCUMENTSTATUS = 'C' -AND A.FBillTypeID = '1cab58bc33d24e27826be02249f4edac' -GROUP BY B.CONTRACTNUMBER,A.FDATE + TRUNCATE TABLE YingShouZhanKuanMX; ---ƱƱڣƱƱ -UPDATE A -SET A.PPBillingDate = B.[Ʊ],A.PPBillingAmount = A.PPBillingAmount + B.˰ϼƱλ -FROM YingShouZhanKuanMX A -INNER JOIN #TEMP2 B ON B.[] = A.CONTRACTNUMBER - ---רƱƱڣרƱƱ -update A -SET A.ZPBillingDate = B.[רƱ],A.ZPBillingAmount = A.ZPBillingAmount + B.˰ϼƱλ -FROM YingShouZhanKuanMX A -INNER JOIN #TEMP1 B ON B.[] = A.CONTRACTNUMBER -END; - ---¿ƱƱ+רƱ -update YingShouZhanKuanMX -SET BillingAmount = PPBillingAmount + ZPBillingAmount + 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 diff --git a/派诺报表SQL文件/应收对账表(明细创建SQL).sql b/派诺报表SQL文件/应收对账表(明细创建SQL).sql index 4d6a60e..1654fa1 100644 --- a/派诺报表SQL文件/应收对账表(明细创建SQL).sql +++ b/派诺报表SQL文件/应收对账表(明细创建SQL).sql @@ -1,31 +1,77 @@ CREATE TABLE YingShouZhanKuanMX ( - [DATE] NVARCHAR(3000), -- ǩ - CONTRACTNUMBER NVARCHAR(3000), -- - ProjectName NVARCHAR(3000), -- Ŀ - SizeModel NVARCHAR(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 NVARCHAR(3000), -- + ShipmentsDate varchar(1000), -- ShipmentsNum DECIMAL(23, 10), -- ShipmentsAmount DECIMAL(23, 10), -- - ReturnDate NVARCHAR(3000), -- ˻ + ReturnDate varchar(1000), -- ˻ ReturnNum DECIMAL(23, 10), -- ˻ ReturnAmount DECIMAL(23, 10), -- ˻ - ZPBillingDate NVARCHAR(3000), -- רƱƱ + ZPBillingDate varchar(1000), -- רƱƱ + QCZPBillingAmount DECIMAL(23, 10), --ڳרƱ ZPBillingAmount DECIMAL(23, 10), -- רƱƱ - PPBillingDate NVARCHAR(3000), --ƱƱ + PPBillingDate varchar(1000), --ƱƱ + QCPPBillingAmount DECIMAL(23, 10), --ڳƱ PPBillingAmount DECIMAL(23, 10), -- ƱƱ BillingAmount DECIMAL(23, 10), -- Ʊ - PaymentDate NVARCHAR(3000), -- ؿ + PaymentDate varchar(1000), -- ؿ PaymentAmount DECIMAL(23, 10), -- ؿ ShippedDebt DECIMAL(23, 10), -- ѳǷ InvoicedDebt DECIMAL(23, 10), -- ѿƱǷ OwedTickets DECIMAL(23, 10), -- ǷƱ - IsEnded NVARCHAR(3000), -- Ƿ - Remark NVARCHAR(3000) -- ע + IsEnded VARCHAR(3000), -- Ƿ + Remark VARCHAR(3000) -- ע ); -DROP TABLE YingShouZhanKuanMX \ No newline at end of file +CREATE TABLE YingShouZhanKuanMX_GZTH ( + 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), -- ע + row_num DECIMAL(23, 10) --ֶ +); + + +--DROP TABLE YingShouZhanKuanMX +--DROP TABLE YingShouZhanKuanMX_GZTH \ No newline at end of file diff --git a/派诺报表SQL文件/应收对账表(简易)更新数据.sql b/派诺报表SQL文件/应收对账表(简易)更新数据.sql index a80e1d4..011667e 100644 --- a/派诺报表SQL文件/应收对账表(简易)更新数据.sql +++ b/派诺报表SQL文件/应收对账表(简易)更新数据.sql @@ -1,42 +1,51 @@ -CREATE PROCEDURE UpdateYSDZBJY_GZTH +ALTER PROCEDURE UpdateYSDZBJY_GZTH AS BEGIN ---ֵ˰Ʊѯ -SELECT B.CONTRACTNUMBER AS '',SUM(A.FAFTERTOTALTAX) AS '˰ϼƱλ',A.FDATE AS 'רƱ' -INTO #TEMP1 -FROM T_IV_SALESIC A -INNER JOIN YingShouZhanKuanJY B ON A.F_PaperNumber = B.CONTRACTNUMBER -WHERE A.FDOCUMENTSTATUS = 'C' -AND A.FBillTypeID = '50ea4e69b6144f69961d2e9b44820929' -GROUP BY B.CONTRACTNUMBER,A.FDATE - ---Ʊѯ -SELECT B.CONTRACTNUMBER AS '',SUM(A.FAFTERTOTALTAX) AS '˰ϼƱλ',A.FDATE AS 'Ʊ' -INTO #TEMP2 -FROM T_IV_SALESIC A -INNER JOIN YingShouZhanKuanJY B ON A.F_PaperNumber = B.CONTRACTNUMBER -WHERE A.FDOCUMENTSTATUS = 'C' -AND A.FBillTypeID = '1cab58bc33d24e27826be02249f4edac' -GROUP BY B.CONTRACTNUMBER,A.FDATE - ---ƱƱڣƱƱ -UPDATE A -SET A.PPBillingDate = B.[Ʊ],A.PPFALLAmountFor = A.PPFALLAmountFor + B.˰ϼƱλ -FROM YingShouZhanKuanJY A -INNER JOIN #TEMP2 B ON B.[] = A.CONTRACTNUMBER - ---רƱƱڣרƱƱ -update A -SET A.ZPBillingDate = B.[רƱ],A.ZPFALLAmountFor = A.ZPFALLAmountFor + B.˰ϼƱλ -FROM YingShouZhanKuanJY A -INNER JOIN #TEMP1 B ON B.[] = A.CONTRACTNUMBER -END; - ---¿ƱƱ+רƱ -update YingShouZhanKuanJY -SET FALLAmountFor = PPFALLAmountFor + ZPFALLAmountFor - - + +TRUNCATE TABLE YingShouZhanKuanJY + +INSERT INTO YingShouZhanKuanJY(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark) +SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,OrderAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark FROM YingShouZhanKuanMX_GZTH + +--Աδݽ +select FID,sum(shipmentsamount) as '', +sum(ReturnAmount) AS '˻', +SUM(PPBillingAmount) AS 'Ʊ', +SUM(ZPBillingAmount) AS 'רƱ' +INTO #TEMP1 +from yingshouzhankuanmx_gzth +group by fid + +UPDATE A +SET A.ShipmentsAmount = B., +A.FBillAllAmount = B.˻, +A.PPFALLAmountFor = B.Ʊ, +A.ZPFALLAmountFor = B.רƱ +FROM YingShouZhanKuanJY A +INNER JOIN #TEMP1 B ON A.FID = B.FID + +--ظFIDȥ +TRUNCATE TABLE YingShouZhanKuanJY_GZTH + +INSERT INTO YingShouZhanKuanJY_GZTH +SELECT +*, +ROW_NUMBER() OVER (PARTITION BY FID ORDER BY FID) as row_num +FROM YingShouZhanKuanJY + +DELETE FROM YingShouZhanKuanJY_GZTH +WHERE row_num <> 1; + +--רƱƱĿƱʱ +UPDATE A +SET A.PPBillingDate = B.PPBillingDate,A.ZPBillingDate = B.ZPBillingDate +FROM YingShouZhanKuanJY_GZTH A +INNER JOIN YingShouZhanKuanMX_GZTH B ON A.FID = B.FID + + +DROP TABLE #TEMP1 + +END \ No newline at end of file diff --git a/派诺报表SQL文件/应收对账表(简易创建).sql b/派诺报表SQL文件/应收对账表(简易创建).sql index cd831ec..2ad7c08 100644 --- a/派诺报表SQL文件/应收对账表(简易创建).sql +++ b/派诺报表SQL文件/应收对账表(简易创建).sql @@ -1,6 +1,8 @@ CREATE TABLE YingShouZhanKuanJY( - Number nvarchar(MAX),-- - Date VARCHAR(2000), -- ǩ + FID VARCHAR(3000), --۶FID + FSaleOrgId VARCHAR(3000),--֯ + FSalerId VARCHAR(3000),--ԱFID + [DATE] VARCHAR(2000), -- ǩ ContractNumber VARCHAR(2000), -- ProjectName VARCHAR(2000), -- Ŀ OrderAmount DECIMAL(23, 10), -- @@ -19,4 +21,30 @@ CREATE TABLE YingShouZhanKuanJY( Remark VARCHAR(2000) -- ע ); -DROP TABLE YingShouZhanKuanJY; \ No newline at end of file +CREATE TABLE YingShouZhanKuanJY_GZTH( + Number VARCHAR(3000), + 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), -- ע + row_num DECIMAL(23, 10) --ֶ +); + +--DROP TABLE YingShouZhanKuanJY; +--DROP TABLE YingShouZhanKuanJY_GZTH; \ No newline at end of file diff --git a/派诺报表SQL文件/应收款对账单取发票金额(取数).sql b/派诺报表SQL文件/应收款对账单取发票金额(取数).sql new file mode 100644 index 0000000..8584bed --- /dev/null +++ b/派诺报表SQL文件/应收款对账单取发票金额(取数).sql @@ -0,0 +1,311 @@ +CREATE PROCEDURE GetIV_SALESICYSMX_GZTH +AS +BEGIN + --ձ + TRUNCATE TABLE FPYSDZDMX; + --ֵ˰Ʊ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + D.FID AS '۶FID', + E.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'Ʊ' --˰ϼ + FROM + T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' --ֵ˰Ʊϵ + INNER JOIN T_SAL_ORDERENTRY E ON E.FENTRYID = C.FSID + INNER JOIN T_SAL_ORDER D ON D.FID = E.FID + WHERE D.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --ֵ˰ר÷Ʊ-Ӧյ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + F.FID AS '۶FID', + FE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_ORDERENTRY' --Ӧյ + INNER JOIN T_SAL_ORDERENTRY FE ON FE.FENTRYID = E.FSID + INNER JOIN T_SAL_ORDER F ON F.FID = FE.FID + WHERE F.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-֪ͨ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + J.FID AS '۶FID', + JE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' -- ˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 'T_AR_receivableEntry' -- ֵ˰Ʊϵ + INNER JOIN T_AR_receivableEntry D ON D.FENTRYID = C.FSID -- Ӧյ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_OUTSTOCKENTRY' -- Ӧյ + INNER JOIN T_SAL_OUTSTOCKENTRY F ON F.FENTRYID = E.FSID -- ۳ⵥϸ + INNER JOIN T_SAL_OUTSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_DELIVERYNOTICEENTRY' -- ۳ⵥ + INNER JOIN T_SAL_DELIVERYNOTICEENTRY H ON H.FENTRYID = G.FSID -- ֪ͨϸ + INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK I ON I.FENTRYID = H.FENTRYID AND I.FSTABLENAME = 'T_SAL_ORDERENTRY' -- ֪ͨϵ + INNER JOIN T_SAL_ORDERENTRY JE ON JE.FENTRYID = I.FSID + INNER JOIN T_SAL_ORDER J ON J.FID = JE.FID + WHERE J.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --ֵ˰ר÷Ʊ-Ӧյ-۳ⵥ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + H.FID AS '۶FID', + HE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_OUTSTOCKENTRY' --Ӧյ + INNER JOIN T_SAL_OUTSTOCKENTRY F ON F.FENTRYID = E.FSID --۳ⵥϸ + INNER JOIN T_SAL_OUTSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_ORDERENTRY' --۳ⵥϵ + INNER JOIN T_SAL_ORDERENTRY HE ON HE.FENTRYID = G.FSID --۶ϸ + INNER JOIN T_SAL_ORDER H ON H.FID = G.FSBILLID --۶ + WHERE H.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --ֵ˰ר÷Ʊ-Ӧյ-ڳ۳ⵥ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + G.FID AS '۶FID', + GE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_INITOUTSTOCKENTRY' --Ӧյ + INNER JOIN T_SAL_INITOUTSTOCKENTRY_LK F ON F.FENTRYID = E.FSID AND F.FSTABLENAME = 'T_SAL_ORDERENTRY' --ڳ۳ⵥ + INNER JOIN T_SAL_ORDERENTRY GE ON GE.FENTRYID = F.FSID --۶ϸ + INNER JOIN T_SAL_ORDER G ON G.FID = F.FSBILLID + WHERE G.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + J.FID AS '۶FID', + JE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյϸ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_RETURNSTOCKENTRY' --Ӧյϵ + INNER JOIN T_SAL_RETURNSTOCKENTRY F ON F.FENTRYID = E.FSID --˻ϸ + INNER JOIN T_SAL_RETURNSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_RETURNNOTICEENTRY' --˻ϵ + INNER JOIN T_SAL_RETURNNOTICEENTRY H ON H.FENTRYID = G.FSID --˻֪ͨϸ + INNER JOIN T_SAL_RETURNNOTICEENTRY_LK I ON I.FENTRYID = H.FENTRYID AND I.FSTABLENAME = 'T_SAL_ORDERENTRY' --˻֪ͨϵ + INNER JOIN T_SAL_ORDERENTRY JE ON JE.FENTRYID = I.FSID + INNER JOIN T_SAL_ORDER J ON J.FID = JE.FID --۶ + WHERE J.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + J.FID AS '۶FID', + JE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյϸ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_RETURNSTOCKENTRY' --Ӧյϵ + INNER JOIN T_SAL_RETURNSTOCKENTRY F ON F.FENTRYID = E.FSID --˻ϸ + INNER JOIN T_SAL_RETURNSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_ORDERENTRY' --˻ϵ + INNER JOIN T_SAL_ORDERENTRY JE ON JE.FENTRYID = G.FSID --۶ϸ + INNER JOIN T_SAL_ORDER J ON J.FID = G.FSBILLID --۶ + WHERE J.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + + --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-˻֪ͨ-۳ⵥ-֪ͨ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + L.FID AS '۶FID', + LE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյϸ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_RETURNSTOCKENTRY' --Ӧյϵ + INNER JOIN T_SAL_RETURNSTOCKENTRY F ON F.FENTRYID = E.FSID --˻ϸ + INNER JOIN T_SAL_RETURNSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_RETURNNOTICEENTRY' --˻ϵ + INNER JOIN T_SAL_RETURNNOTICEENTRY H ON H.FENTRYID = G.FSID --˻֪ͨϸ + INNER JOIN T_SAL_RETURNNOTICEENTRY_LK I ON I.FENTRYID = H.FENTRYID AND I.FSTABLENAME = 'T_SAL_OUTSTOCKENTRY' --˻֪ͨϵ + INNER JOIN T_SAL_OUTSTOCKENTRY_LK J ON J.FENTRYID = I.FSID AND J.FSTABLENAME = 'T_SAL_DELIVERYNOTICEENTRY' --۳ⵥϵ + INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK K ON K.FENTRYID = J.FSID AND K.FSTABLENAME = 'T_SAL_ORDERENTRY' --֪ͨϵ + INNER JOIN T_SAL_ORDERENTRY LE ON LE.FENTRYID = K.FSID --۶ϸ + INNER JOIN T_SAL_ORDER L ON L.FID = LE.FID --۶ + WHERE L.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-֪ͨ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + L.FID AS '۶FID', + LE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյϸ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_RETURNSTOCKENTRY' --Ӧյϵ + INNER JOIN T_SAL_RETURNSTOCKENTRY F ON F.FENTRYID = E.FSID --˻ϸ + INNER JOIN T_SAL_RETURNSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_OUTSTOCKENTRY' --˻ϵ + INNER JOIN T_SAL_OUTSTOCKENTRY_LK J ON J.FENTRYID = G.FSID AND J.FSTABLENAME = 'T_SAL_DELIVERYNOTICEENTRY' --۳ⵥϵ + INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK K ON K.FENTRYID = J.FSID AND K.FSTABLENAME = 'T_SAL_ORDERENTRY' --֪ͨϵ + INNER JOIN T_SAL_ORDERENTRY LE ON LE.FENTRYID = K.FSID --۶ϸ + INNER JOIN T_SAL_ORDER L ON L.FID = LE.FID --۶ + WHERE L.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --Ʊֵ˰ר÷Ʊ-Ӧյ-˻-۳ⵥ-۶ + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE) + SELECT DISTINCT + L.FID AS '۶FID', + LE.FENTRYID AS '۶FENTRYID', + A.FSALEORGID AS '֯', + A.FBILLTYPEID AS 'Ʊ', + A.FDATE AS 'Ʊ', + A.FID AS 'ƱFID', + B.FENTRYID AS 'ƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND C.FSTABLENAME = 't_AR_receivableEntry' --ֵ˰Ʊϵ + INNER JOIN t_AR_receivableEntry D ON D.FENTRYID = C.FSID --Ӧյϸ + INNER JOIN T_AR_RECEIVABLEENTRY_LK E ON E.FENTRYID = D.FENTRYID AND E.FSTABLENAME = 'T_SAL_RETURNSTOCKENTRY' --Ӧյϵ + INNER JOIN T_SAL_RETURNSTOCKENTRY F ON F.FENTRYID = E.FSID --˻ϸ + INNER JOIN T_SAL_RETURNSTOCKENTRY_LK G ON G.FENTRYID = F.FENTRYID AND G.FSTABLENAME = 'T_SAL_OUTSTOCKENTRY' --˻ϵ + INNER JOIN T_SAL_OUTSTOCKENTRY_LK J ON J.FENTRYID = G.FSID AND J.FSTABLENAME = 'T_SAL_ORDERENTRY' --۳ⵥϵ + INNER JOIN T_SAL_ORDERENTRY LE ON LE.FENTRYID = J.FSID --۶ϸ + INNER JOIN T_SAL_ORDER L ON L.FID = LE.FID --۶ + WHERE A.FID IN (SELECT FID FROM YingShouZhanKuanMX) + AND A.FDOCUMENTSTATUS = 'C' + + --Աݽзϼ + SELECT DISTINCT + XSDDFID, + XSDDFENTRYID, + FPLX, + FPJSZZ, + FPFID, + FPFENTRYID, + SUM(KPJE) AS KPJE + INTO #TEMP1 + FROM FPYSDZDMX + GROUP BY XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPFID,FPFENTRYID + + --ձ + TRUNCATE TABLE FPYSDZDMX; + + INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPLX,FPJSZZ,FPFID,FPFENTRYID,KPJE) + SELECT XSDDFID,XSDDFENTRYID,FPLX,FPJSZZ,FPFID,FPFENTRYID,KPJE FROM #TEMP1; + + UPDATE A + SET A.FPRQ = B.FDATE + FROM FPYSDZDMX A + INNER JOIN T_IV_SALESIC B ON A.FPFID = B.FID + + + + UPDATE FPYSDZDMX + SET FPLX = 'Ʊ' + WHERE FPLX = '1cab58bc33d24e27826be02249f4edac' + + UPDATE FPYSDZDMX + SET FPLX = 'רƱ' + WHERE FPLX = '50ea4e69b6144f69961d2e9b44820929' + + --ѯַƱ + TRUNCATE TABLE FPYSDZDHPMXHP; + + + --ƱƱ + INSERT INTO FPYSDZDHPMXHP(HZFPFID,LZFPFID,LZFPFENTRYID,HZKPJE) + SELECT DISTINCT + A.FID AS 'ַƱFID', + AL.FID AS 'ַƱFID', + ALE.FENTRYID AS 'ַƱFENTRYID', + B.FALLAMOUNTFOR AS 'ַƱ' --˰ϼ + FROM T_IV_SALESIC A + INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID + INNER JOIN T_IV_SALESICENTRY_LK C ON C.FENTRYID = B.FENTRYID AND (C.FSTABLENAME = 'T_IV_SALESICENTRY' OR C.FSTABLENAME = 'T_IV_SALESICENTRY1') + INNER JOIN T_IV_SALESIC AL ON AL.FID = C.FSBILLID + INNER JOIN T_IV_SALESICENTRY ALE ON ALE.FENTRYID = C.FSID + + --Աзϼ + SELECT DISTINCT + HZFPFID, + LZFPFID, + LZFPFENTRYID, + SUM(HZKPJE) AS ַƱ + INTO #TEMP2 + FROM FPYSDZDHPMXHP + GROUP BY HZFPFID,LZFPFID,LZFPFENTRYID + + TRUNCATE TABLE FPYSDZDHPMXHP; + + INSERT INTO FPYSDZDHPMXHP(HZFPFID,LZFPFID,LZFPFENTRYID,HZKPJE) + SELECT HZFPFID,LZFPFID,LZFPFENTRYID,ַƱ FROM #TEMP2 + + + DROP TABLE #TEMP1,#TEMP2 + +END;