diff --git a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs index da70ffe..0a4f557 100644 --- a/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs +++ b/Pilot.Report.Exploitation/SBUYingShouBiao/SBUYingShouBiao.cs @@ -101,6 +101,8 @@ namespace Pilot.Report.Exploitation.SBUYingShouBiao ReportHeader header = new ReportHeader(); header.AddChild("SBU", new LocaleValue("SBU", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar); //header.AddChild("本年度发货及验收额", new LocaleValue("已到期应收账款(含子公司)", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney); + header.AddChild("仪表发货金额", new LocaleValue("仪表发货金额", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney); + header.AddChild("系统验收金额", new LocaleValue("系统验收金额", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney); header.AddChild("已到期应收账款", new LocaleValue("已到期应收账款(含子公司)", this.Context.UserLocale.LCID), SqlStorageType.SqlMoney); //一级表头 var header1 = header.AddChild("应收账款账龄", new LocaleValue("应收账款账龄")); @@ -193,12 +195,13 @@ FROM T_SAL_ORDERFIN aa ON ACL.名称=L.FNAME AND ISNULL(ACL.明细区域,'') != '' WHERE ACL.区域=a.SBU AND bb.fid = (SELECT MAX(fid) FROM MBBA_t_Cust100002 aaa WHERE aaa.FDOCUMENTSTATUS='C' AND YEAR(aaa.F_VRYF_DATE_83G)=YEAR( '{begin}' ) )) ccc),0) +,[仪表发货金额]=sum([仪表发货金额]) +,[系统验收金额]=sum([系统验收金额]) FROM ZRP_YingShouMingXi_yuyubo a {Filter} GROUP BY a.SBU) a - - "); + //执行SQL并动态创建报表 DBUtils.ExecuteDynamicObject(this.Context, sql); } diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index 51ae461..c1b17cc 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Pilot.Report.Exploitation.Common; +using Kingdee.BOS.Log; namespace Pilot.Report.Exploitation.SpecialDetails { @@ -220,7 +221,7 @@ WHERE AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' @@ -264,7 +265,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' ) AND B.FQTY >= 0 AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND A.FMANUALCLOSE = '0' AND A.F_CONTRACTNUMBER NOT LIKE 'Z%' AND A.FMANUALCLOSE <> '1' @@ -318,7 +319,7 @@ WHERE AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' @@ -377,7 +378,7 @@ WHERE AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%') AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' @@ -853,7 +854,7 @@ FROM #PLChongDianZhuangHeTong ;"); 0 Sort FROM #tempDaBiao t1) t1 order by Sort desc,fid desc ,FIDENTITYID ", tableName); - Loghelp.Log(sql); + //Logger.Error("特价明细报表", sql, new Exception()); DBUtils.Execute(this.Context, sql); } diff --git a/应收明细SQL.sql b/应收明细SQL.sql index 02e29d3..35b3e25 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -24,7 +24,7 @@ BEGIN [Ա],[÷],[ȡֵ],[Ƿ],[ǷԤ],[Ƿ񼯲Ŀ],[ͬ],[ǷѴ],[ܶ],[Ӧձ],[ۼƷ] ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶],[տ̯],[տ̯],[ܶ],[տۼƺ] - ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)] ,[ӷ],[] ,[]) + ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)] ,[ӷ],[] ,[],[DZ],[ϵͳս]) SELECT [۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], @@ -33,7 +33,7 @@ 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],[],[۶],[տ̯],[տ̯],[ܶ] -,[տۼƺ] ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)],[ӷ],[] ,[] +,[տۼƺ] ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)],[ӷ],[] ,[],[DZ],[ϵͳս] FROM ( SELECT A.FID [۵ID] ,ISNULL(O.fid,l.fid) [ԱID] @@ -167,7 +167,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE ,Cccc.FNUMBER AS [ͻ] ,0 [ۼƵ(ԭ)],0 [Ӧտϼ(ԭ)] ,ISNULL(a.F_expenses,0) [ӷ] - ,A.F_responsible [],w.[] + ,A.F_responsible [],w.[],0 [DZ],0 [ϵͳս] -----------------from -------- FROM T_SAL_ORDER A WITH(NOLOCK) @@ -410,6 +410,52 @@ WHERE [ UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ͻ]='ͨ' WHERE [λ] LIKE 'ͨ%' OR [λ] LIKE 'йͨ޹˾%' +UPDATE [ZRP_YingShouMingXi_yuyubo] SET [DZ]=FBillAllAmount*[̯]*[տ̯]*0.01*0.01 +FROM(SELECT SUM(B.FBillAllAmount) AS FBillAllAmount,A.۵ID,a.ԱID,a.տID FROM [ZRP_YingShouMingXi_yuyubo] a WITH(NOLOCK) +INNER JOIN T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) ON SAL.F_PAPERCONTRACT = A.ֽʺͬ AND SAL.FSALEORGID=a.֯ID + INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID + WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = A.ֽʺͬ AND SAL.FSALEORGID=a.֯ID AND YEAR(sal.FDATE)=YEAR(GETDATE()) + AND a.[ͬ] IN ('׮豸','','DZ') + GROUP BY A.۵ID,a.ԱID,a.տID) a + WHERE A.۵ID=[ZRP_YingShouMingXi_yuyubo].۵ID AND a.ԱID = [ZRP_YingShouMingXi_yuyubo].ԱID + AND a.տID=[ZRP_YingShouMingXi_yuyubo].տID + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ϵͳս]=[Ʊܽ2]*[̯]*[տ̯]*0.01*0.01 +FROM +( +SELECT FAFTERTOTALTAXFOR AS 'Ʊܽ2',A.۵ID,a.ԱID,a.տID +FROM [ZRP_YingShouMingXi_yuyubo] a WITH(NOLOCK) + INNER JOIN + ( + SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS FAFTERTOTALTAXFOR + FROM + ( + SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID + ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FAFTERTOTALTAXFOR + WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FAFTERTOTALTAXFOR END AS FAFTERTOTALTAXFOR + --FAFTERTOTALTAX + FROM T_IV_SALESIC t0 WITH(NOLOCK) + INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID + WHERE t0.FDOCUMENTSTATUS= 'C' AND YEAR(t0.FDATE)=YEAR(GETDATE()) + ) tt + GROUP BY F_PaperNumber, FSALEORGID + ) AD ON AD.F_PaperNumber = A.ֽʺͬ AND ad.FSALEORGID=a.֯ID + WHERE AD.F_PaperNumber = A.ֽʺͬ AND AD.FSALEORGID=a.֯ID + AND a.[ͬ] IN ('׮','׮Ӫ','۵','','Z') + ) a + WHERE A.۵ID=[ZRP_YingShouMingXi_yuyubo].۵ID AND a.ԱID = [ZRP_YingShouMingXi_yuyubo].ԱID + AND a.տID=[ZRP_YingShouMingXi_yuyubo].տID + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ϵͳս]=a.FBillAllAmount*[̯]*[տ̯]*0.01*0.01 +FROM + ( SELECT FBillAllAmount,aa.FID FROM T_SAL_ORDER aa WITH(NOLOCK) + LEFT JOIN T_SAL_ORDERFIN fin WITH(NOLOCK) ON aa.FID=fin.FID + WHERE F_XMYSSJ IS NOT NULL AND YEAR(F_XMYSSJ)=YEAR(GETDATE()) + ) a + WHERE A.FID=[ZRP_YingShouMingXi_yuyubo].۵ID AND [ͬ] IN ('׮ϵͳ','ܴװ','ϵͳ','ϵͳʩͬ') + + + --UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ͻö]=bb.FCREDITAMOUNT --FROM (SELECT FCreditAmount,b.FUseOrgId,b.FNUMBER FROM T_CRE_CUSTARCHIVESENTRY a LEFT JOIN T_BD_CUSTOMER b ON a.FObjectId=b.FCUSTID diff --git a/特价明细表SQL22.sql b/特价明细表SQL22.sql index d9a0cfc..ee1f292 100644 --- a/特价明细表SQL22.sql +++ b/特价明细表SQL22.sql @@ -62,8 +62,7 @@ WHERE AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' - AND B.FMANUALROWCLOSE <> '1' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND B.FMANUALROWCLOSE <> '1' AND A.F_CONTRACTNUMBER NOT LIKE 'Z%' AND A.FID NOT IN ( @@ -105,7 +104,7 @@ WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' ) AND (A.F_SpecialContracts = '' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr> c.FBillAllAmount ) AND B.FQTY >= 0 AND A.FDOCUMENTSTATUS = 'C' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND A.FBUSINESSTYPE = 'NORMAL' AND A.FMANUALCLOSE = '0' AND A.F_CONTRACTNUMBER NOT LIKE 'Z%' @@ -161,7 +160,7 @@ WHERE AND B.F_SPECIALOFFER = '1' AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND A.FBUSINESSTYPE = 'NORMAL' AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' @@ -223,7 +222,7 @@ WHERE AND (A.F_SpecialContracts = '' OR a.F_GROSSMARGIN1='<35%') AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' - AND a.FCloseStatus='A' AND b.FMrpCloseStatus='A' + AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1'