From 0fb2096e5546f2a522dab6b733cfd4335ff0f265 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 14 Aug 2025 17:27:25 +0800 Subject: [PATCH] 11 --- .../SpecialDetails/SpecialDetailsReport.cs | 6 +++--- 非C#代码文件/应收明细SQL.sql | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index 1f8e084..26f6e16 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -508,7 +508,7 @@ FROM #PLChongDianZhuangHeTong ;"); NULL END AS 'OrderAllAmount', --订单总额 CASE - WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY fid desc ,FIDENTITYID) = 1 THEN + WHEN ROW_NUMBER() OVER (PARTITION BY A.F_CONTRACTNUMBER ORDER BY A.fid desc ,B.FENTRYID) = 1 THEN C.FBILLALLAMOUNT_LC - ISNULL(ABS(B3.FBillAllAmount_LC), 0) - ISNULL(H6.FALLAMOUNT_LC, 0) ELSE NULL @@ -790,7 +790,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL sql += string.Format($@"/*dialect*/ Select *, - ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC,FENTRYID) AS FIDENTITYID + ROW_NUMBER() OVER (ORDER BY Date desc,FID DESC ,[TableName],FENTRYID) AS FIDENTITYID INTO {tableName} From (SELECT [TableName] @@ -881,7 +881,7 @@ where TableName IN ('#PLChongDianZhuangHeTong') AND #tempDaBiao.AFBILLNO=B.AFBIL { ReportTitles reportTitles = new ReportTitles(); DynamicObject customFilter = filter.FilterParameter.CustomFilter; - + if (customFilter != null) { // 下单时间 diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index f66583c..8ef6c3e 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -25,7 +25,7 @@ BEGIN ,[ۼ˻],[ۼƿƱ],[Ӧտϼ],[δܶ],[δڽ],[ʱ],[ڽ],[ʵѳӦտϼ],[Ŀ׶],[տ],[ۼƵ], [1-6],[7-12],[13-18],[19],[1],[-׶],[],[֯ID],[],[۶],[տ̯],[տ̯],[ܶ],[տۼƺ] ,[ұ],[ұID],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)] ,[ӷ],[] ,[],[DZ],[ϵͳս],[] - ,[K3ۼƷ(λ)],[K3ۼ˻(λ)],[K3ۼרƱ(λ)],[K3ۼƱ(λ)],[K3ۼƷ(λ)],[K3ۼ˻(λ)],[K3ۼרƱ(λ)],[K3ۼƱ(λ)]) + ,[K3ۼƷ(λ)],[K3ۼ˻(λ)],[K3ۼרƱ(λ)],[K3ۼƱ(λ)],[K3ۼƷ(λ)],[K3ۼ˻(λ)],[K3ۼרƱ(λ)],[K3ۼƱ(λ)],ӷ) SELECT [۵ID],[ԱID],[տID],[տ],[F_RecConditionId],[ܶ],[Ա],[̯],[̯],[SBU] ,[ϸ],[λ],[˾],[ͻ],[ֽʺͬ],[Ŀ],[ǩ],[],[],[ۼƷ],[Ʊ], @@ -35,7 +35,7 @@ SELECT ,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],[],[ͻö],[ͻ],[ۼƵ(ԭ)],[Ӧտϼ(ԭ)],[ӷ],[] ,[],[DZ],[ϵͳս],[] -,0 [K3ۼƷ(λ)],0 [K3ۼ˻(λ)],0 [K3ۼרƱ(λ)],0 [K3ۼƱ(λ)],0 [K3ۼƷ(λ)],0 [K3ۼ˻(λ)],0 [K3ۼרƱ(λ)],0 [K3ۼƱ(λ)] +,0 [K3ۼƷ(λ)],0 [K3ۼ˻(λ)],0 [K3ۼרƱ(λ)],0 [K3ۼƱ(λ)],0 [K3ۼƷ(λ)],0 [K3ۼ˻(λ)],0 [K3ۼרƱ(λ)],0 [K3ۼƱ(λ)],ӷ FROM ( SELECT A.FID [۵ID] ,ISNULL(O.fid,l.fid) [ԱID] @@ -178,6 +178,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE ,Cccc.FNUMBER AS [ͻ] ,0 [ۼƵ(ԭ)],0 [Ӧտϼ(ԭ)] ,ISNULL(a.F_expenses,0) [ӷ] + ,ISNULL(a.F_expenses,0) [ӷ] ,ISNULL(ISNULL(N.F_res,O.FNAME),L.FNAME) [],w.[],0 [DZ],0 [ϵͳս] ,uuu.FNAME AS [] -----------------from -------- @@ -356,7 +357,7 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] set --,[ʱ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN [ԤƵʱ] ELSE NULL END --,[ڽ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN([ۼƷ]-[ۼ˻]-[ۼƵ])*[̯]*0.01*ISNULL([տ̯],100)*0.01 ELSE 0 END -,[ʵѳӦտϼ]=CASE WHEN [ܶ] >0 THEN ([ۼƷ]+[K3ۼƷ(λ)]-[ۼ˻]-[K3ۼ˻(λ)]/- [ۼƵ] )*[̯]*0.01 ELSE 0 end +,[ʵѳӦտϼ]=CASE WHEN [ܶ] >0 THEN ([ۼƷ]+[K3ۼƷ(λ)]-[ۼ˻]-[K3ۼ˻(λ)]/- [ۼƵ] )*[̯]*0.01+[ӷ] ELSE 0 end ,[Ŀ׶]= CASE WHEN [Ŀʱ]>='1990-01-01' AND [Ŀʱ] IS NOT NULL THEN '' WHEN [Ŀʱ]>='1990-01-01' AND [Ŀʱ] IS NOT NULL THEN '' WHEN ISNULL([Ŀ],'') <> '' THEN [Ŀ] WHEN ISNULL([ۼƷ],0) = 0 THEN 'δ' @@ -618,7 +619,7 @@ FROM ,[K3ۼרƱ(λ)] ,[K3ۼƱ(λ)] FROM [ZRP_YingShouMingXi_yuyubo] A - WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/)<>[ۼƵ(ԭ)] + WHERE ([ܶ]-[ۼ˻(ԭ)]-[K3ۼ˻(λ)]/+[ӷ])<>[ۼƵ(ԭ)] ORDER BY A.[۵ID],[ԱID],[տID]; update ReceivablesDetailsTable set F_061=B.F_061, F_054=B.F_054 ,F_055=B.F_055,F_056=B.F_056