From 7d73c70907952af04cc4e39d40f40b5616cd1e01 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Mon, 9 Jun 2025 09:36:26 +0800 Subject: [PATCH] 1 --- .../Receivables/ReceivablesDetails.cs | 3 +- 应收明细SQL.sql | 30 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs index 6980a2e..ac0f72f 100644 --- a/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs +++ b/Pilot.Report.Exploitation/Receivables/ReceivablesDetails.cs @@ -300,7 +300,8 @@ else //获取表1 var sql_1 = ""; - sql_1 += string.Format($@"/*dialect*/Select * From (Select * From [ReceivablesDetailsTable] where {wheresql} + sql_1 += string.Format($@"/*dialect*/Select * From (Select [FId],[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],[F_041],[F_042],[F_043],[F_044],[F_045],[F_046],[F_047],[F_048],[F_049],[F_050],[F_051],[F_052],[F_053],[F_054],[F_055],[F_056],[F_057],[F_058],[F_059],[F_000],[F_060],[F_061],[F_062],[F_063],[销售单主键ID],[销售员ID],[收款条件主键ID],[EditTime],[IfManualEdit],[F_064],[F_065],[F_066],[F_067],[F_068],[BiBie],[HuiLv],[DingDanZongE_YuanBi],[ZeRenRen],[XinYongEDu],[客户编码],[DaoKuanJinE_YuanBi],[YingShouHeJi_YuanBi],[YunZaFei],[LeiJiTuiHuoJinE_YuanBi] + From [ReceivablesDetailsTable] where {wheresql} Union ALL (Select null,null,'合计：',null,null,null,null,null,null,null,SUM(F_010), diff --git a/应收明细SQL.sql b/应收明细SQL.sql index 3b2bcb6..753a887 100644 --- a/应收明细SQL.sql +++ b/应收明细SQL.sql @@ -156,7 +156,8 @@ SELECT A.FID [ ,(SELECT ll.FNAME FROM dbo.T_BD_CURRENCY_L ll WITH(NOLOCK) where ll.FCURRENCYID=fin.FSettleCurrId ) AS [ұ] ,fin.FSettleCurrId [ұID] , fin.FExchangeRate [] - , (0) [ͻö] + , (SELECT TOP 1 FCreditAmount FROM T_CRE_CUSTARCHIVESENTRY aa LEFT JOIN T_BD_CUSTOMER bb ON aa.FObjectId=bb.FCUSTID +WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBER ORDER BY aa.FExpiryDate desc) [ͻö] ,Cccc.FNUMBER AS [ͻ] ,0 [ۼƵ(ԭ)],0 [Ӧտϼ(ԭ)] ,ISNULL(a.F_expenses,0) [ӷ] @@ -243,14 +244,13 @@ GROUP BY F_PaperNumber, FSALEORGID --where [ԤƵʱ] !='' WHERE [ܶ]<>0 AND SUBSTRING([ֽʺͬ],1,1) != 'Z' ORDER BY A.[۵ID],[ԱID],[տID]; - - + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [2]=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23) +'---'+FORMAT( ISNULL(B.FBillAllAmount_LC,0),'0.00')+'Ԫ' ,',') 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 = [ֽʺͬ]),'') + WHERE SAL.FDOCUMENTSTATUS= 'C' AND SAL.F_PAPERCONTRACT = [ֽʺͬ] AND sal.FSaleOrgId=[ZRP_YingShouMingXi_yuyubo].֯ID),'') , [Ʊ2]= ISNULL( ( @@ -298,6 +298,20 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] set WHEN ISNULL( [ۼƷ],0) = ISNULL([ܶ],0) THEN '' WHEN ISNULL([ܶ],0) > ISNULL( [ۼƷ],0) THEN '' END ; + SELECT sum(a.ʵѳӦտϼ) [ʵѳӦտϼ] ,ͻ INTO #temp2 FROM ( + SELECT AVG([ʵѳӦտϼ]) AS [ʵѳӦտϼ],۵ID,ԱID,ͻ FROM [ZRP_YingShouMingXi_yuyubo] + GROUP BY ۵ID,ԱID,ͻ) a + GROUP BY ͻ + + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ԤƵʱ]=(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 = [ֽʺͬ] AND sal.FSaleOrgId=[ZRP_YingShouMingXi_yuyubo].֯ID) + FROM #temp2 b + WHERE [ZRP_YingShouMingXi_yuyubo].ͻ=b.ͻ and տ LIKE '%Э鸶%' AND [ZRP_YingShouMingXi_yuyubo].[ʵѳӦտϼ]>0 + AND b.[ʵѳӦտϼ]*[] > [ͻö]*0.9 + DROP TABLE #temp2 update [ZRP_YingShouMingXi_yuyubo] set [ʱ]=CASE WHEN [ԤƵʱ] IS NOT NULL AND [ԤƵʱ] <= GETDATE() AND [ԤƵʱ] >'1990-01-01' AND [ܶ]>0 THEN [ԤƵʱ] ELSE NULL END @@ -357,10 +371,10 @@ UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ WHERE [λ] LIKE 'ͨ%' OR [λ] LIKE 'йͨ޹˾%' -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 -WHERE FCreditStatus='A' AND FRowAuditStatus='A') bb -WHERE bb.FNUMBER=[ͻ] +--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 +--WHERE FCreditStatus='A' AND FRowAuditStatus='A') bb +--WHERE bb.FNUMBER=[ͻ] --SELECT TOP 100 []=ISNULL((SELECT STRING_AGG(CONVERT(NVARCHAR(10),SAL.FDATE,23)+'---'+CONVERT(NVARCHAR(100),ROUND(B.FBillAllAmount_LC,2)),',')) AS '' FROM T_SAL_DELIVERYNOTICE SAL WITH(NOLOCK) --INNER JOIN T_SAL_DELIVERYNOTICEFIN B WITH(NOLOCK) ON SAL.FID =B.FID