diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json index a0bede5..911c489 100644 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ b/.vs/Pilot.Report/v17/DocumentLayout.backup.json @@ -1,86 +1,82 @@ { "Version": 1, - "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\", + "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|e:\\gzc#code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\pilot.report\\pilot.report\\pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\resultskanbansummary\\resultskanbansumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\annualsalespaymentsum\\annualsalespaymentsumreport.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" + "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\pilot.report.exploitation\\receivables\\receivablesautoexecute.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\receivables\\receivablesautoexecute.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ { - "Orientation": 1, + "Orientation": 0, "VerticalTabListWidth": 256, "DocumentGroups": [ { - "DockedHeight": 200, - "SelectedChildIndex": 3, + "DockedWidth": 200, + "SelectedChildIndex": 0, "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Loghelp.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Common\\Loghelp.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Common\\Loghelp.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Common\\Loghelp.cs*", + "RelativeToolTip": "Pilot.Report.Exploitation\\Common\\Loghelp.cs*", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-19T10:12:26.006Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 3, - "Title": "infydjzb..sql ", - "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\infydjzb..sql", - "ToolTip": "infydjzb..sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-03-19T10:54:19.227Z", + "Title": "ReceivablesAutoExecute.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\Receivables\\ReceivablesAutoExecute.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABkAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-18T01:50:18.881Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "ReceivablesDetails.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\Receivables\\ReceivablesDetails.cs", + "ViewState": "AgIAADABAAAAAAAAAAAUwOIBAAAZAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-17T10:11:20.902Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 2, - "Title": "tvgkdhe3..sql ", - "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\tvgkdhe3..sql", - "ToolTip": "tvgkdhe3..sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-03-18T01:33:40.742Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql ", - "DocumentMoniker": "C:\\Users\\21985\\Downloads\\\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql", - "ToolTip": "\u7EE9\u6548\u770B\u677F\u6C47\u603B\u8868.sql ", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-03-18T01:34:20.652Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "ResultsKanbanSumReport.cs", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\u62A5\u8868-\u88F4\u8C6A\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Pilot.Report\\Pilot.Report\\Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "RelativeToolTip": "Pilot.Report.Exploitation\\ResultsKanbanSummary\\ResultsKanbanSumReport.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAH4AAAAgAAAAAAAAAA==", + "Title": "AnnualSalesPaymentSumReport.cs", + "DocumentMoniker": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", + "RelativeDocumentMoniker": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", + "ToolTip": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", + "RelativeToolTip": "Pilot.Report.Exploitation\\AnnualSalesPaymentSum\\AnnualSalesPaymentSumReport.cs", + "ViewState": "AgIAAHkAAAAAAAAAAAAiwIUDAABxAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-14T11:26:46.159Z", + "WhenOpened": "2025-03-17T07:39:30.7Z", "EditorCaption": "" } ] diff --git a/Pilot.Report.Exploitation/Common/Loghelp.cs b/Pilot.Report.Exploitation/Common/Loghelp.cs index f733eca..925729e 100644 --- a/Pilot.Report.Exploitation/Common/Loghelp.cs +++ b/Pilot.Report.Exploitation/Common/Loghelp.cs @@ -13,7 +13,7 @@ namespace Pilot.Report.Exploitation.Common public static void Log(string str) { - //return; + return; str = DateTime.Now + "----\n" + str; string now = DateTime.Now.Date.ToString("yyyy-MM-dd"); string currentDirectory = Environment.CurrentDirectory; diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index a8ae2b2..65723df 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -235,9 +235,10 @@ else /// public void FilterCallBack(FormResult action) { - + Dictionary dicList = new Dictionary(); if (action.ReturnData != null) { + string wheresql = " 1=1 "; FilterParameter returnData = action.ReturnData as FilterParameter;//过滤框返回的数据 DynamicObject dyObj = returnData.CustomFilter as DynamicObject; @@ -299,22 +300,26 @@ else //获取表1 var sql_1 = ""; - sql_1 += string.Format($@"/*dialect*/Select * From (Select * From View_PerformanceSharing_yuyubo where {wheresql} + sql_1 += string.Format($@"/*dialect*/Select * From (Select * From [ReceivablesDetailsTable] where {wheresql} Union ALL (Select null,null,'合计：',null,null,null,null,null,null,null,SUM(F_010), - null,null,null,null,null,null,SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),null,SUM(F_024),SUM(F_025), - null,SUM(F_027),null,null,null,null,null,null,null,null,SUM(F_036),null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 + null,null,null,null,null,null,SUM(F_017),SUM(F_018),SUM(F_019),SUM(F_020),SUM(F_021),SUM(F_022),null + ,F_024=(SELECT SUM(F_024) FROM [ReceivablesDetailsTable] hh where {wheresql}) + ,SUM(F_025), + null + ,F_027=(SELECT SUM(F_027) FROM [ReceivablesDetailsTable] hh where {wheresql}) + ,null,null,null,null,null,null,null,null,SUM(F_036),null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,0,0,0,null,0 From - (select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,F_024 ,F_025, - F_027,F_036 from - View_PerformanceSharing_yuyubo + (select distinct [销售单主键ID],[销售员ID],[F_010],F_017,F_018,F_019,F_020,F_021,F_022 ,0 as F_024 ,F_025, + 0 as F_027,F_036 from + [ReceivablesDetailsTable] where {wheresql} ) a )) W Order by W.F_001"); var sql_2 = ""; sql_2 += string.Format(@"/*dialect*/Select top 1 * From ReceivablesDetailsTable"); - + var sql_List2 = DBUtils.ExecuteDynamicObject(Context, sql_2); @@ -475,6 +480,8 @@ else #endregion } } + Loghelp.Log("合计"); + Loghelp.Log(sql_1); var sql_List1 = DBUtils.ExecuteDynamicObject(Context, sql_1); int indexi = 0; @@ -616,6 +623,23 @@ else this.View.Model.SetValue("F_062", item["F_062"], indexi); //63 this.View.Model.SetValue("F_063", item["F_063"], indexi); + + //【订单总额、累计发货金额、累计退货金额、累计开票金额、累计到款金额、应收款合计、未出货总额、实际已出货应收款合计、】的明细需要去重 + if (dicList.ContainsKey(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString())) + { + this.View.Model.SetValue("F_010", null, indexi); + this.View.Model.SetValue("F_017", null, indexi); + this.View.Model.SetValue("F_018", null, indexi); + this.View.Model.SetValue("F_019", null, indexi); + this.View.Model.SetValue("F_020", null, indexi); + this.View.Model.SetValue("F_021", null, indexi); + this.View.Model.SetValue("F_022", null, indexi); + this.View.Model.SetValue("F_025", null, indexi); + + } + else + dicList.Add(item["销售单主键ID"].ToString() + "-" + item["销售员ID"].ToString(), 0); + indexi++; #endregion } diff --git a/应收明细SQL.sql b/应收明细SQL.sql index 481d04d..fd8c85e 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -23,7 +23,7 @@ BEGIN [Ŀʱ],[ʱʱ],[Ƿǰ],[],[],[],[תרСʱ],[Ƿת],[Ƿ黹], [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],[ܶ],[Ӧձ],[ۼƷ] ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], - [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶]) + [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶],[տ̯],[տ̯]) SELECT [۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], @@ -31,14 +31,14 @@ SELECT [Ŀʱ],[ʱʱ],[Ƿǰ],[],[],[],[תרСʱ],[Ƿת],[Ƿ黹], [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],0 [ܶ],[Ӧձ], 0 [ۼƷ] ,0 [ۼ˻],0 [ۼƿƱ],0 [Ӧտϼ],0 [δܶ],0 [δڽ],NULL [ʱ],0 [ڽ],0 [ʵѳӦտϼ],NULL [Ŀ׶],NULL [տ],0 [ۼƵ], -NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-׶],NULL [],[֯ID],[],[۶] +NULL [1-6],NULL [7-12],NULL [13-18],NULL [19],NULL [1],NULL [-׶],NULL [],[֯ID],[],[۶],[տ̯],[տ̯] FROM ( SELECT A.FID [۵ID] ,ISNULL(O.fid,l.fid) [ԱID] ,ISNULL(w.FENTRYID,0) [տID], ISNULL(w.FNAME,'') AS [տ], W.F_RecConditionId -,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID )AS [ܶ] +,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WHERE FF.FID = A.FID ) AS [ܶ],w.FRECADVANCEAMOUNT [տ̯],w.FRECADVANCERATE [տ̯] ,ISNULL(O.FNAME,L.FNAME) AS [Ա],CONVERT(DECIMAL(18,2),ISNULL(n.FSHARERATE,100)) AS [̯] -,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBillAllAmount_LC)) [̯] +,CONVERT(DECIMAL(18,6),ISNULL(n.FSHAREAMOUNT,fin.FBillAllAmount_LC )) [̯] ,ISNULL(ACO.,ACL.) AS [SBU] , ISNULL (ACO.[ϸ] , ACL.ϸ) AS [ϸ],c.FNAME AS [λ] ,ISNULL(K.FDATAVALUE,'') AS [˾] ,P.FDATAVALUE AS [ͻ],A.F_contractnumber AS [ֽʺͬ] , G.FNAME AS [Ŀ] ,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [ǩ],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS [] @@ -47,7 +47,7 @@ SELECT A.FID [ WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'') ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID - WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),0) + WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber AND SAL.FSALEORGID=a.FSALEORGID),0) ,[Ʊ]=ISNULL((CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN T.Ʊ ELSE T.ûкɫĿƱ END ),'') ,[ۼ˻]=ISNULL(( @@ -56,9 +56,9 @@ SELECT A.FID [ INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0) - ,[ۼƿƱ] =ISNULL( CASE WHEN SUBSTRING(U.FDATAVALUE,0,1)= 'W' THEN AD.Ʊܽ ELSE AD.[Ʊܽ(Ʊ)] END,0) - ,[ۼƵ]=ISNULL(ae.ۼտ,0) - ,[ԤƵʱ]=FaHuoRiQi.[ԤƵʱ] + ,[ۼƿƱ] =AD.Ʊܽ + ,[ۼƵ]=ISNULL(a.F_Amount,0) + ,[ԤƵʱ] ,[ʱ]=W.FRECADVANCEAMOUNT ,[ʱ]=W.F_DAY @@ -69,20 +69,20 @@ SELECT A.FID [ ,CONVERT(NVARCHAR(10),a.F_XMYSSJ,23) AS 'Ŀʱ' --ȡĿʱ ,CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0) ,w.F_PMSDate),23) AS 'ʱʱ' ,[Ƿǰ]=CASE WHEN a.F_YYS = 0 THEN '' ELSE '' END - ,[]= ISNULL( ROUND( DATEDIFF(DAY,CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0) ,W.F_PMSDate),23),GETDATE()) / 30,0) ,0 ) + ,[]= 0 ----,CASE WHEN A.F_OrderType in ('DZ','YB') THEN 'Ԫ' ELSE s.FCAPTION END AS '' --ȡ۶-ͷ-#ֵΪDZʱijԪΪϵͳ ,[]=(SELECT TOP 1 CASE WHEN s.FCAPTION = 'DZ' THEN 'Ԫ' ELSE s.FCAPTION END FROM T_META_FORMENUMITEM R LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 WHERE r.FVALUE = A.F_OrderType ) - ,(SELECT TOP 1 CASE WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' then 'Ŀ꣬زֿ' - WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' then 'Ŀδ깤Ƿͬ' - WHEN S.FCAPTION <> 'DZ' AND w.FID is not null then '' - WHEN S.FCAPTION <> 'DZ' AND w.FID is not null then 'Э鸶' - ELSE 'Ԥտ+/Կ+ʱ' END from T_META_FORMENUMITEM R + ,(SELECT TOP 1 CASE WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' THEN 'Ŀ꣬زֿ' + WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' THEN 'Ŀδ깤Ƿͬ' + WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN '' + WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN 'Э鸶' + ELSE 'Ԥտ+/Կ+ʱ' END FROM T_META_FORMENUMITEM R LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 - where r.FVALUE = A.F_OrderType) AS '' - ,isnull(convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS 'תרСʱ' - ,case when convert(nvarchar(10),dateadd(day,isnull(w.f_day,0)+180 ,W.F_PMSDate),23) is null then '' else '' end AS 'Ƿת' + WHERE r.FVALUE = A.F_OrderType) AS '' + ,ISNULL(CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS 'תרСʱ' + ,CASE WHEN CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23) IS NULL THEN '' ELSE '' END AS 'Ƿת' ,'' AS 'Ƿ黹' -- ,'' AS 'Ա' -- ,'' AS '÷' -- @@ -139,58 +139,66 @@ SELECT A.FID [ ) T ON T.F_PAPER = A.F_contractnumber LEFT JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory - LEFT JOIN - ( - SELECT - F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS 'Ʊܽ', - CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS 'Ʊܽ(Ʊ)' - FROM t_AR_receivable A - INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID - GROUP BY F_Papercontract - ) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber - LEFT join - ( - SELECT a.F_Papercontract, - sum(d.FCURWRITTENOFFAMOUNT) as 'ۼտ' - FROM t_AR_receivable A - INNER JOIN T_AR_RECEIVABLEENTRY E ON E.FID =A.FID - INNER JOIN T_AR_RECMacthLogENTRY B ON A.FBILLNO = B.FSRCBILLNO - INNER JOIN T_AR_RECMacthLog C ON C.FID = B.FID - INNER JOIN T_AR_RECMacthLogENTRY D ON D.FID = B.FID - AND D.FSOURCETYPE = '36cf265bd8c3452194ed9c83ec5e73d2' - WHERE - 1=1 - group by a.F_Papercontract - ) AE ON AE.F_Papercontract = A.F_contractnumber + -- LEFT JOIN + --( + -- SELECT + -- F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS 'Ʊܽ', + -- CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS 'Ʊܽ(Ʊ)' + -- FROM t_AR_receivable A + -- INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID + -- GROUP BY F_Papercontract + --) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber + + LEFT JOIN + ( + SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAX) AS 'Ʊܽ' FROM ( + SELECT F_PaperNumber, t0.FSALEORGID, + CASE WHEN SUBSTRING(F_PaperNumber,1,1)='w' THEN FAFTERTOTALTAX + WHEN SUBSTRING(F_PaperNumber,1,1)!='w' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAX END AS F_GeneralInvoice, + FAFTERTOTALTAX +FROM T_IV_SALESIC t0 ) tt +GROUP BY F_PaperNumber, FSALEORGID + ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID + --LEFT join + --( + -- SELECT a.F_Papercontract, + -- sum(d.FCURWRITTENOFFAMOUNT) as 'ۼտ' + -- FROM t_AR_receivable A + -- INNER JOIN T_AR_RECEIVABLEENTRY E ON E.FID =A.FID + -- INNER JOIN T_AR_RECMacthLogENTRY B ON A.FBILLNO = B.FSRCBILLNO + -- INNER JOIN T_AR_RECMacthLog C ON C.FID = B.FID + -- INNER JOIN T_AR_RECMacthLogENTRY D ON D.FID = B.FID + -- AND D.FSOURCETYPE = '36cf265bd8c3452194ed9c83ec5e73d2' + -- WHERE + -- 1=1 + -- group by a.F_Papercontract + --) AE ON AE.F_Papercontract = A.F_contractnumber LEFT JOIN - (select FID,max([ԤƵʱ]) AS [ԤƵʱ] FROM - (select plan1.FID ,CASE - WHEN X.FNAME in ('Ԥ(DZ)','Ԥ(ϵͳ)') THEN CONVERT(NVARCHAR, AA.FDATE, 120) - WHEN X.FNAME in ('տ(DZ)','տ(ϵͳ)') AND DATEADD(day, plan1.F_DAY, CK.F_SFSIGNATURETIME) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY, 0), ISNULL(CK.F_SFSIGNATURETIME,'')) , 120) - WHEN X.FNAME in ('Ʊտ(ϵͳ)','Ʊտ(DZ)') AND DATEADD(day, plan1.F_DAY,FP.F_DATE) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(FP.F_DATE,'')) , 120) - WHEN X.FNAME in ('(DZ)','(ϵͳ)') AND DATEADD(day, plan1.F_DAY,Q.) >= GETDATE() THEN CONVERT(NVARCHAR,DATEADD(day, ISNULL(plan1.F_DAY,0),ISNULL(Q.,'')) , 120) - ELSE '' --EXEC [GetReceiveData2] '100302','',''; - END AS 'ԤƵʱ' --۶-ƻ-PMS# +(SELECT DISTINCT FID,[ԤƵʱ] AS [ԤƵʱ] , F_RECCONDITIONID ,FNAME ,F_DAY FROM + ( + SELECT plan1.FID ,CASE + WHEN X.FNAME LIKE '%Ԥ%' THEN CONVERT(NVARCHAR, AA.FDATE, 120) + WHEN X.FNAME LIKE '%տ%' THEN DATEADD(day, plan1.F_DAY, CK.F_SFSIGNATURETIME) + WHEN X.FNAME LIKE '%Ʊտ%' THEN DATEADD(day, plan1.F_DAY,FP.FAPPROVEDATE) + --WHEN X.FNAME LIKE '%%' THEN DATEADD(day, plan1.F_DAY,Q.) + -- ע⣺۶ڡֶΣPMSϵͳ ֶδ + ELSE null + END AS 'ԤƵʱ' --۶-ƻ-PMS# + ,plan1.F_RECCONDITIONID,X.FNAME, plan1.F_DAY from T_SAL_ORDER AA left join T_SAL_ORDERPLAN plan1 on plan1.FID=aa.FID - LEFT JOIN T_BD_RecCondition_L X on X.FID = plan1.F_RecConditionId - LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER --۳ⵥ - LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER --ֵ˰ר÷Ʊ - LEFT JOIN - ( - SELECT F_Papercontract,MAX(CONVERT(NVARCHAR(10), AA.FDATE,23)) AS '',SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE AA - INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON AA.FID =B.FID - WHERE AA.FDOCUMENTSTATUS= 'C' - GROUP BY AA.F_Papercontract - ) Q ON Q.F_PAPERCONTRACT = aa.F_contractnumber --ȡ֪ͨķ + LEFT JOIN T_SAL_OUTSTOCK CK on CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --۳ⵥ + LEFT JOIN T_IV_SALESIC FP on FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER -- + + ) dd ) FaHuoRiQi1 + on FaHuoRiQi1.FID=a.fid AND FaHuoRiQi1.F_RECCONDITIONID=w.F_RECCONDITIONID + LEFT JOIN + (SELECT distinct F_Papercontract,FSALEORGID FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='') AB + ON AB.F_PAPERCONTRACT = A.F_contractnumber AND AB.FSALEORGID=a.FSaleOrgId - ) FaHuoRiQi1 - GROUP BY FID - ) FaHuoRiQi on FaHuoRiQi.FID=a.fid - LEFT JOIN (SELECT distinct F_Papercontract FROM T_SAL_DELIVERYNOTICE WHERE F_SFYFH ='') AB ON AB.F_PAPERCONTRACT = A.F_contractnumber WHERE ( ( A.FSALEORGID = 100302 AND ( (ACO. != '̼ǿ' OR ACO. IS null ) @@ -205,13 +213,16 @@ SELECT A.FID [ WHERE [ܶ]<>0 AND SUBSTRING([ֽʺͬ],1,1) != 'Z' ORDER BY A.[۵ID],[ԱID] -update [ZRP_YingShouMingXi_yuyubo] set [ܶ]=[̯],[ۼƷ]=[ۼƷ]*[̯]*0.01,[ۼ˻]=[ۼ˻]*[̯]*0.01 -,[ۼƿƱ]=[ۼƿƱ]*[̯]*0.01,[ۼƵ]=[ۼƵ]*[̯]*0.01 -,[Ӧտϼ]=[̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01,[δܶ]=[̯]-[ۼƷ]*[̯]*0.01 -,[δڽ]=CASE WHEN [ԤƵʱ] <'1990-01-01' OR [ԤƵʱ] > GETDATE() THEN ([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01 ELSE 0 END +update [ZRP_YingShouMingXi_yuyubo] set [ܶ]=[̯],[ۼƷ]=[ۼƷ]*[̯]*0.01 +,[ۼ˻]=[ۼ˻]*[̯]*0.01 +,[ۼƿƱ]=[ۼƿƱ]*[̯]*0.01 +,[ۼƵ]=[ۼƵ]*[̯]*0.01 +,[Ӧտϼ]=[̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 +,[δܶ]=[̯]-[ۼƷ]*[̯]*0.01 +,[δڽ]=CASE WHEN [ԤƵʱ] <'1990-01-01' OR [ԤƵʱ] > GETDATE() THEN ([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01*ISNULL([տ̯],100)*0.01 ELSE 0 END ,[ʱ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN [ԤƵʱ] ELSE NULL END -,[ڽ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01 ELSE 0 END +,[ڽ]=CASE WHEN [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01*ISNULL([տ̯],100)*0.01 ELSE 0 END ,[ʵѳӦտϼ]=([ۼƷ]-[ۼ˻]- [ۼƵ] )*[̯]*0.01 ,[տ]=CASE WHEN []>6 THEN 'תӦרС' ELSE [Ա] END ,[Ŀ׶]= CASE WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ],0) = 0 THEN 'δ' @@ -231,6 +242,7 @@ update [ZRP_YingShouMingXi_yuyubo] SET [ ,[Ʊ]=CASE WHEN [Ʊ] > '1990-01-01' THEN [Ʊ] ELSE NULL END ,[ԤƵʱ]=CASE WHEN [ԤƵʱ] > '1990-01-01' THEN [ԤƵʱ] ELSE NULL END ,[ʱʱ]=CASE WHEN [ʱʱ] > '1990-01-01' THEN [ʱʱ] ELSE NULL END ,[תרСʱ]=CASE WHEN [תרСʱ] > '1990-01-01' THEN [תרСʱ] ELSE NULL END + , []= ISNULL( ROUND( DATEDIFF(DAY,[ʱ],GETDATE()) / 30,0) ,0 ) update [ReceivablesDetailsTable] set [F_001]=b.[۵ID],[F_002]=b.[Ա],[F_003]=b.[SBU],[F_004]=B.[ϸ],[F_005]=b.[λ],[F_006]=b.[˾] @@ -252,6 +264,7 @@ update [ZRP_YingShouMingXi_yuyubo] SET [ AND [ReceivablesDetailsTable].[տID]=[ZRP_YingShouMingXi_yuyubo].[տID] DELETE [ReceivablesDetailsTable] WHERE [۵ID] IS NULL OR [۵ID]=0 ; + INSERT INTO [ReceivablesDetailsTable] ( [F_001],[F_002],[F_003],[F_004],[F_005],[F_006],[F_007],[F_008],[F_009],[F_010],[F_011],[F_012],[F_013],[F_014],[F_015],[F_016],[F_017],[F_018],[F_019],[F_020] ,[F_021],[F_022],[F_023],[F_024],[F_025],[F_026],[F_027],[F_028],[F_029],[F_030],[F_031],[F_032],[F_033],[F_034],[F_035],[F_036],[F_037],[F_038],[F_039],[F_040],