From 3ad0f2055c3a6d39e04e0dbacb6bad8b7e01598e Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 20 Mar 2025 11:58:03 +0800 Subject: [PATCH] 1 --- .../v17/DocumentLayout.backup.json | 87 ----------- .../AnnualSalesPaymentSumReport.cs | 64 ++++---- 应收明细SQL.sql | 143 ++++++++---------- 3 files changed, 96 insertions(+), 198 deletions(-) delete mode 100644 .vs/Pilot.Report/v17/DocumentLayout.backup.json diff --git a/.vs/Pilot.Report/v17/DocumentLayout.backup.json b/.vs/Pilot.Report/v17/DocumentLayout.backup.json deleted file mode 100644 index 911c489..0000000 --- a/.vs/Pilot.Report/v17/DocumentLayout.backup.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "Version": 1, - "WorkspaceRootPath": "F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\", - "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\common\\loghelp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|f:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\piolot_repotform_git\\pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|solutionrelative:pilot.report.exploitation\\receivables\\receivablesdetails.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{FFC984E2-278D-4951-94F0-31F8FBEE69EA}|Pilot.Report.Exploitation\\Pilot.Report.Exploitation.csproj|F:\\\u73E0\u6D77\u9879\u76EE\\\u6D3E\u8BFA\u9879\u76EE\\\u6D3E\u8BFA\u62A5\u8868(1)\\\u6D3E\u8BFA\u62A5\u8868\\\u4EE3\u7801\\Piolot_RepotForm_Git\\pilot.report.exploitation\\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:{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": 0, - "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "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": "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": "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-17T07:39:30.7Z", - "EditorCaption": "" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs index edcfa6c..8547dd3 100644 --- a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs +++ b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs @@ -135,17 +135,17 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum // 组织 var organization = organizationList == null ? "" : (string.Join(",", organizationList)); - // 开始日期 - string fStrartDate = customFilter["FStrartDate"]?.ToString(); + //// 开始日期 + //string fStrartDate = customFilter["FStrartDate"]?.ToString(); - // 结束日期 - string fEndDate = customFilter["FEndDate"]?.ToString(); + //// 结束日期 + //string fEndDate = customFilter["FEndDate"]?.ToString(); - // 审核开始日期 - string fSDate = customFilter["FSDate"]?.ToString(); + //// 审核开始日期 + //string fSDate = customFilter["FSDate"]?.ToString(); - // 审核结束日期 - string fEDate = customFilter["FEDate"]?.ToString(); + //// 审核结束日期 + //string fEDate = customFilter["FEDate"]?.ToString(); // 下单时间 string fDate = customFilter["F_Date"]?.ToString(); @@ -467,14 +467,14 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum { sql += string.Format(@" AND D.FSALEORGID in ({0})", organization); } - if (!string.IsNullOrEmpty(fStrartDate)) - { - sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate); - } - if (!string.IsNullOrEmpty(fEndDate)) - { - sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate); - } + //if (!string.IsNullOrEmpty(fStrartDate)) + //{ + // sql += string.Format(@" AND D.FDate >= '{0}'", fStrartDate); + //} + //if (!string.IsNullOrEmpty(fEndDate)) + //{ + // sql += string.Format(@" AND D.FDate <= '{0}'", fEndDate); + //} sql += string.Format(@";"); @@ -909,22 +909,22 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum { sql += string.Format(@" AND A.FSaleOrgId in ({0})", organization); } - if (!string.IsNullOrEmpty(fStrartDate)) - { - sql += string.Format(@" AND A.FDate >= '{0}'", fStrartDate); - } - if (!string.IsNullOrEmpty(fEndDate)) - { - sql += string.Format(@" AND A.FDate <= '{0}'", fEndDate); - } - if (!string.IsNullOrEmpty(fSDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE >= '{0}'", fSDate); - } - if (!string.IsNullOrEmpty(fEDate)) - { - sql += string.Format(@" AND A.FAPPROVEDATE <= '{0}'", fEDate); - } + //if (!string.IsNullOrEmpty(fStrartDate)) + //{ + // sql += string.Format(@" AND A.FDate >= '{0}'", fStrartDate); + //} + //if (!string.IsNullOrEmpty(fEndDate)) + //{ + // sql += string.Format(@" AND A.FDate <= '{0}'", fEndDate); + //} + //if (!string.IsNullOrEmpty(fSDate)) + //{ + // sql += string.Format(@" AND A.FAPPROVEDATE >= '{0}'", fSDate); + //} + //if (!string.IsNullOrEmpty(fEDate)) + //{ + // sql += string.Format(@" AND A.FAPPROVEDATE <= '{0}'", fEDate); + //} sql += string.Format(@";"); diff --git a/应收明细SQL.sql b/应收明细SQL.sql index fd8c85e..06f69e7 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -24,7 +24,7 @@ BEGIN [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],[ܶ],[Ӧձ],[ۼƷ] ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶],[տ̯],[տ̯]) -SELECT +SELECT [۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], [ۼ˻],[ۼƿƱ],[ۼƵ],[ԤƵʱ],[ʱ],[ʱ],[PMSʱ],[Ŀ],[Ŀʱ], @@ -36,29 +36,60 @@ 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 [ܶ],w.FRECADVANCEAMOUNT [տ̯],w.FRECADVANCERATE [տ̯] +,(SELECT SUM(FBillAllAmount_LC) FROM T_SAL_ORDERFIN FF WITH(NOLOCK) 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 )) [̯] ,ISNULL(ACO.,ACL.) AS [SBU] , ISNULL (ACO.[ϸ] , ACL.ϸ) AS [ϸ],c.FNAME AS [λ] ,ISNULL(K.FDATAVALUE,'') AS [˾] ,P.FDATAVALUE AS [ͻ],A.F_contractnumber AS [ֽʺͬ] , G.FNAME AS [Ŀ] ,CONVERT( NVARCHAR(10), YEAR(A.FAPPROVEDATE)) AS [ǩ],CONVERT(VARCHAR(10), A.FAPPROVEDATE,23) AS [] - ,[]=ISNULL((SELECT (CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)) AS '' FROM T_SAL_DELIVERYNOTICE SAL - INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID + ,[]=ISNULL((SELECT (CONVERT(NVARCHAR(10),MAX(SAL.FDATE),23)) AS '' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) + INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.F_contractnumber),'') - ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL - INNER JOIN T_SAL_DELIVERYNOTICEFIN B ON SAL.FID =B.FID + ,[ۼƷ]=ISNULL( (SELECT SUM(B.FBillAllAmount_LC) AS 'ۼƷ' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) + INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID 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(( SELECT SUM(B.FBillAllAmount_LC) AS 'ۼ˻' - FROM T_SAL_RETURNSTOCK AA - INNER JOIN T_SAL_RETURNSTOCKFIN B ON AA.FID =B.FID + FROM T_SAL_RETURNSTOCK AA WITH(NOLOCK) + INNER JOIN T_SAL_RETURNSTOCKFIN B WITH(NOLOCK) ON AA.FID =B.FID WHERE AA.FDOCUMENTSTATUS= 'C' AND A.F_contractnumber = AA.F_contractnumber ),0) ,[ۼƿƱ] =AD.Ʊܽ - ,[ۼƵ]=ISNULL(a.F_Amount,0) - ,[ԤƵʱ] + ,[ۼƵ]=ISNULL(a.F_Amount,0) + --,[ԤƵʱ]='' + ,[ԤƵʱ]= (SELECT MAX([ԤƵʱ]) AS [ԤƵʱ] FROM + ( + SELECT DISTINCT * FROM ( + SELECT plan1.FID ,CASE + WHEN X.FNAME like '%Ԥ%' THEN CONVERT(NVARCHAR, AA.FAPPROVEDATE, 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,plan1.FENTRYID ,AA.FAPPROVEDATE,CK.F_SFSIGNATURETIME + from + T_SAL_ORDER AA WITH(NOLOCK) + left join + T_SAL_ORDERPLAN plan1 WITH(NOLOCK) ON plan1.FID=aa.FID + LEFT JOIN T_BD_RecCondition_L X WITH(NOLOCK) ON X.FID = plan1.F_RecConditionId + LEFT JOIN (SELECT MAX(F_SFSIGNATURETIME) F_SFSIGNATURETIME ,F_CONTRACTNUMBER,FSALEORGID + FROM T_SAL_OUTSTOCK WITH(NOLOCK) + WHERE F_CONTRACTNUMBER = a.F_CONTRACTNUMBER AND FSALEORGID = a.FSALEORGID + GROUP BY F_CONTRACTNUMBER,FSALEORGID + ) CK + ON CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --۳ⵥ + LEFT JOIN + (SELECT MAX(FAPPROVEDATE) FAPPROVEDATE,F_PAPERNUMBER,FSALEORGID FROM + T_IV_SALESIC ff WITH(NOLOCK) + WHERE ff.F_PAPERNUMBER = a.F_CONTRACTNUMBER AND ff.FSALEORGID = a.FSALEORGID + GROUP BY F_PAPERNUMBER,FSALEORGID) FP ON FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER AND FP.FSALEORGID = AA.FSALEORGID + WHERE aa.FID=a.FID AND plan1.FENTRYID=w.FENTRYID + ) kk + WHERE KK.fid=a.FID AND w.FENTRYID= KK.FENTRYID ) aa) ,[ʱ]=W.FRECADVANCEAMOUNT ,[ʱ]=W.F_DAY @@ -71,18 +102,19 @@ SELECT A.FID [ ,[Ƿǰ]=CASE WHEN a.F_YYS = 0 THEN '' ELSE '' END ,[]= 0 ----,CASE WHEN A.F_OrderType in ('DZ','YB') THEN 'Ԫ' ELSE s.FCAPTION END AS '' --ȡ۶-ͷ-#ֵΪDZʱijԪΪϵͳ - ,[]=(SELECT TOP 1 CASE WHEN s.FCAPTION = 'DZ' THEN 'Ԫ' ELSE s.FCAPTION END FROM T_META_FORMENUMITEM R - LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 - WHERE r.FVALUE = A.F_OrderType ) - ,(SELECT TOP 1 CASE WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' THEN 'Ŀ꣬زֿ' - WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' THEN 'Ŀδ깤Ƿͬ' - WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN '' - WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN 'Э鸶' - ELSE 'Ԥտ+/Կ+ʱ' END FROM T_META_FORMENUMITEM R - LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 - WHERE r.FVALUE = A.F_OrderType) AS '' - ,ISNULL(CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23),'') AS 'תרСʱ' - ,CASE WHEN CONVERT(NVARCHAR(10),DATEADD(DAY,ISNULL(w.f_day,0)+180 ,W.F_PMSDate),23) IS NULL THEN '' ELSE '' END AS 'Ƿת' + --,[]=(SELECT TOP 1 CASE WHEN s.FCAPTION = 'DZ' THEN 'Ԫ' ELSE s.FCAPTION END FROM T_META_FORMENUMITEM R WITH(NOLOCK) + --LEFT JOIN T_META_FORMENUMITEM_L S WITH(NOLOCK) ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 + -- WHERE r.FVALUE = A.F_OrderType ) + ,'' ,'' + --,(SELECT TOP 1 CASE WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ <> '' THEN 'Ŀ꣬زֿ' + -- WHEN S.FCAPTION = 'DZ' AND a.F_XMYSSJ = '' THEN 'Ŀδ깤Ƿͬ' + -- WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN '' + -- WHEN S.FCAPTION <> 'DZ' AND w.FID IS NOT NULL THEN 'Э鸶' + -- ELSE 'Ԥտ+/Կ+ʱ' END FROM T_META_FORMENUMITEM R + --LEFT JOIN T_META_FORMENUMITEM_L S ON S.FENUMID = R.FENUMID AND S.FLOCALEID = 2052 + -- WHERE r.FVALUE = A.F_OrderType) AS '' + ,'' AS 'תרСʱ' + ,'' AS 'Ƿת' ,'' AS 'Ƿ黹' -- ,'' AS 'Ա' -- ,'' AS '÷' -- @@ -109,7 +141,7 @@ SELECT A.FID [ SELECT DISTINCT x.FNAME +'--'+CONVERT(NVARCHAR(50), CONVERT(INT, w.F_DAY))+'--'+CONVERT(NVARCHAR(50),CONVERT(DECIMAL(18,2), w.FRECADVANCERATE))+'%' AS FNAME ,w.FID,w.F_PMSDate ,W.FRECADVANCEAMOUNT,w.F_DAY - ,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE + ,w.FENTRYID, W.F_RecConditionId ,w.FRECADVANCERATE ,x.FNAME AS fname2 FROM T_SAL_ORDERPLAN w WITH(NOLOCK) LEFT JOIN T_BD_RecCondition_L X on X.FID = W.F_RecConditionId ) w ON w.FID=A.FID @@ -132,23 +164,12 @@ SELECT A.FID [ ( SELECT F_Paper ,CONVERT(NVARCHAR(10), MAX(FDATE),23) AS 'Ʊ' ,CONVERT(NVARCHAR(10), MAX(FDATE),23) AS 'ûкɫĿƱ' - FROM t_AR_receivable A - INNER JOIN T_AR_RECEIVABLEENTRY B ON A.FID = B.FID + FROM t_AR_receivable A WITH(NOLOCK) + INNER JOIN T_AR_RECEIVABLEENTRY B WITH(NOLOCK) ON A.FID = B.FID WHERE A.FDOCUMENTSTATUS = 'C' AND A.FCancelStatus = 'A' GROUP BY F_Paper ) T ON T.F_PAPER = A.F_contractnumber - LEFT JOIN V_ASSISTANTDATA U ON U.FENTRYID = A.F_Ordercategory - - -- LEFT JOIN - --( - -- SELECT - -- F_Papercontract,CAST( sum(b.FALLAMOUNT) AS DECIMAL(18,6)) AS 'Ʊܽ', - -- CAST (sum(CASE WHEN F_Papercontract = 'Y' THEN b.FALLAMOUNT ELSE 0 END ) AS DECIMAL(18,6)) AS 'Ʊܽ(Ʊ)' - -- FROM t_AR_receivable A - -- INNER JOIN T_AR_RECEIVABLEFIN B ON A.FID = B.FID - -- GROUP BY F_Papercontract - --) AD ON AD.F_PAPERCONTRACT = A.F_contractnumber - + LEFT JOIN V_ASSISTANTDATA U WITH(NOLOCK) ON U.FENTRYID = A.F_Ordercategory LEFT JOIN ( SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAX) AS 'Ʊܽ' FROM ( @@ -156,50 +177,14 @@ SELECT A.FID [ 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 +FROM T_IV_SALESIC t0 WITH(NOLOCK) ) 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 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 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 + (SELECT distinct F_Papercontract,FSALEORGID FROM T_SAL_DELIVERYNOTICE WITH(NOLOCK) WHERE F_SFYFH ='') AB ON AB.F_PAPERCONTRACT = A.F_contractnumber AND AB.FSALEORGID=a.FSaleOrgId - WHERE ( ( A.FSALEORGID = 100302 AND ( (ACO. != '̼ǿ' OR ACO. IS null ) AND (ACL. != '̼ǿ' OR ACL. IS null ) @@ -229,8 +214,8 @@ update [ZRP_YingShouMingXi_yuyubo] set [ WHEN ISNULL( [ۼƷ],0) = ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ],0) then '' END ,[-׶]=CASE WHEN []>=1 AND []<=6 THEN '1-6' WHEN []>=7 AND []<=12 THEN '7-12' WHEN []>=13 AND []<=18 THEN '13-18' WHEN []>=19 THEN '19' ELSE '' END - ,[]=CASE WHEN []>=1 AND []<=6 THEN '' WHEN []>=7 AND []<=12 THEN '߿' WHEN []>=13 AND []<=18 - THEN 'ʦ' WHEN []>=19 THEN '' ELSE '' END + --,[]=CASE WHEN []>=1 AND []<=6 THEN '' WHEN []>=7 AND []<=12 THEN '߿' WHEN []>=13 AND []<=18 + --THEN 'ʦ' WHEN []>=19 THEN '' ELSE '' END ,[1-6]=CASE WHEN []>=1 AND []<=6 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END ,[7-12]=CASE WHEN []>=7 AND []<=12 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END ,[13-18]=CASE WHEN []>=13 AND []<=18 THEN [̯]-([ۼ˻]+[ۼƵ])*[̯]*0.01 ELSE 0 END @@ -289,7 +274,7 @@ GO -DELETE dbo.ReceivablesDetailsTable; +TRUNCATE TABLE dbo.ReceivablesDetailsTable; EXEC PR_YingShouMingXi_yuyubo