From 3427feaa3025c27284d3de5a6a7c89c671f7bfa8 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Sun, 13 Apr 2025 18:20:18 +0800 Subject: [PATCH] 2222 --- .../AnnualSalesPaymentSumReport.cs | 26 ++++++++++--------- ZPR_SalesRportShareData.sql | 7 +++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs index aca6fe0..128ad96 100644 --- a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs +++ b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs @@ -1425,18 +1425,20 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk ,isnull(SUM([WuhanPilotThisYear]),0) AS [WuhanPilotThisYear],isnull(SUM([WuhanPilotUsualAlter]),0) AS [WuhanPilotUsualAlter],isnull(SUM([Discovery]),0) AS [Discovery] ,isnull(SUM([HongKongPilot]),0) AS [HongKongPilot] ,isnull(SUM([HuaXiaYunLian]),0) AS [HuaXiaYunLian],isnull(SUM([ZhuhaiPilot]),0) AS [ZhuhaiPilot],isnull(SUM([PilotSumAmount]),0) AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FIDENTITYID ,2 as sort - ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],SUM([兴诺业绩]) [兴诺业绩],SUM([兴诺往年订单变更]) [兴诺往年订单变更],SUM([武汉派诺-当年业绩]) [武汉派诺-当年业绩],SUM([武汉派诺-往年订单变更]) [武汉派诺-往年订单变更],SUM([碳索业绩]) [碳索业绩] + ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],isnull(SUM([兴诺业绩]),0) [兴诺业绩],isnull(SUM([兴诺往年订单变更]),0) [兴诺往年订单变更],isnull(SUM([武汉派诺-当年业绩]),0) [武汉派诺-当年业绩],isnull(SUM([武汉派诺-往年订单变更]),0) [武汉派诺-往年订单变更],isnull(SUM([碳索业绩]),0) [碳索业绩] , isnull(SUM([香港派诺业绩]),0) [香港派诺业绩], isnull(SUM([华夏云联业绩]),0) [华夏云联业绩],100302 as [组织ID] FROM {tableName}{guid} where [销售员ID]<99383300 AND 组织ID=100302 - UPDATE {tableName}{guid} SET [XCumulative]=(b.[XCumulative]) ,[UsualAlterAmount]=(b.[UsualAlterAmount]),[SiNO]=(b.[SiNO]),[SiNOUsualAlter]=(b.[SiNOUsualAlter]) - ,[WuhanPilotThisYear]=(b.[WuhanPilotThisYear]),[WuhanPilotUsualAlter]=(b.[WuhanPilotUsualAlter]),[Discovery]=(b.[Discovery]),[HongKongPilot]=(b.[HongKongPilot]),[HuaXiaYunLian]=(b.[HuaXiaYunLian]) - ,[ZhuhaiPilot]=(b.[ZhuhaiPilot]),[PilotSumAmount]=(b.[PilotSumAmount]) - FROM (SELECT [XCumulative]=SUM(b.[XCumulative]) ,[UsualAlterAmount]=SUM(b.[UsualAlterAmount]),[SiNO]=SUM(b.[SiNO]),[SiNOUsualAlter]=SUM(b.[SiNOUsualAlter]) - ,[WuhanPilotThisYear]=SUM(b.[WuhanPilotThisYear]),[WuhanPilotUsualAlter]=SUM(b.[WuhanPilotUsualAlter]),[Discovery]=SUM(b.[Discovery]),[HongKongPilot]=SUM(b.[HongKongPilot]),[HuaXiaYunLian]=SUM(b.[HuaXiaYunLian]) - ,[ZhuhaiPilot]=SUM(b.[ZhuhaiPilot]),[PilotSumAmount]=SUM(b.[PilotSumAmount]) FROM {tableName}{guid} b WITH(NOLOCK) WHERE b.[销售员ID] < 99383300 ) b + UPDATE {tableName}{guid} SET [XCumulative]=isnull((b.[XCumulative]),0) ,[UsualAlterAmount]=isnull((b.[UsualAlterAmount]),0),[SiNO]=(b.[SiNO]),[SiNOUsualAlter]=(b.[SiNOUsualAlter]) + ,[WuhanPilotThisYear]=isnull((b.[WuhanPilotThisYear]),0),[WuhanPilotUsualAlter]=isnull((b.[WuhanPilotUsualAlter]),0),[Discovery]=isnull((b.[Discovery]),0) +,[HongKongPilot]=isnull((b.[HongKongPilot]),0),[HuaXiaYunLian]=isnull((b.[HuaXiaYunLian]),0) + ,[ZhuhaiPilot]=isnull((b.[ZhuhaiPilot]),0),[PilotSumAmount]=isnull((b.[PilotSumAmount]),0) + FROM (SELECT [XCumulative]=SUM(b.[XCumulative]) ,[UsualAlterAmount]=isnull(SUM(b.[UsualAlterAmount]),0),[SiNO]=isnull(SUM(b.[SiNO]),0),[SiNOUsualAlter]=isnull(SUM(b.[SiNOUsualAlter]) ,0) + ,[WuhanPilotThisYear]=isnull(SUM(b.[WuhanPilotThisYear]),0),[WuhanPilotUsualAlter]=isnull(SUM(b.[WuhanPilotUsualAlter]),0),[Discovery]=isnull(SUM(b.[Discovery]),0) +,[HongKongPilot]=isnull(SUM(b.[HongKongPilot]),0),[HuaXiaYunLian]=isnull(SUM(b.[HuaXiaYunLian]),0) + ,[ZhuhaiPilot]=isnull(SUM(b.[ZhuhaiPilot]),0),[PilotSumAmount]=isnull(SUM(b.[PilotSumAmount]),0) FROM {tableName}{guid} b WITH(NOLOCK) WHERE b.[销售员ID] < 99383300 ) b WHERE {tableName}{guid} .[销售员ID]=99383322; @@ -1586,7 +1588,7 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk ,isnull(SUM([WuhanPilotThisYear]),0) AS [WuhanPilotThisYear],isnull(SUM([WuhanPilotUsualAlter]),0) AS [WuhanPilotUsualAlter],isnull(SUM([Discovery]),0) AS [Discovery] ,isnull(SUM([HongKongPilot]),0) AS [HongKongPilot] ,isnull(SUM([HuaXiaYunLian]),0) AS [HuaXiaYunLian],isnull(SUM([ZhuhaiPilot]),0) AS [ZhuhaiPilot],isnull(SUM([PilotSumAmount]),0) AS [PilotSumAmount],(SELECT MAX(FID) FROM {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM {tableName}{guid} )+1 AS FIDENTITYID ,4 as sort - ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],SUM([兴诺业绩]) [兴诺业绩],SUM([兴诺往年订单变更]) [兴诺往年订单变更],SUM([武汉派诺-当年业绩]) [武汉派诺-当年业绩],SUM([武汉派诺-往年订单变更]) [武汉派诺-往年订单变更],SUM([碳索业绩]) [碳索业绩] + ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],isnull(SUM([兴诺业绩]),0) [兴诺业绩], isnull( SUM([兴诺往年订单变更]),0) [兴诺往年订单变更],isnull(SUM([武汉派诺-当年业绩]),0) [武汉派诺-当年业绩],isnull(SUM([武汉派诺-往年订单变更]),0) [武汉派诺-往年订单变更],isnull(SUM([碳索业绩]),0) [碳索业绩] , isnull(SUM([香港派诺业绩]),0) [香港派诺业绩], isnull(SUM([华夏云联业绩]),0) [华夏云联业绩] ,999999 as [组织ID] FROM {tableName}{guid} where [销售员ID] IN (99383327,99383326,99383325,99383324,99383323,99383322) @@ -1601,10 +1603,10 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month , SUM(X12Month) AS X12Month , SUM(H12Month) AS H12Month - , SUM([XCumulative]) AS [XCumulative], SUM([UsualAlterAmount]) AS [UsualAlterAmount],SUM([SiNO]) AS [SiNO], SUM([SiNOUsualAlter]) AS [SiNOUsualAlter] - ,SUM([WuhanPilotThisYear]) AS [WuhanPilotThisYear],SUM([WuhanPilotUsualAlter]) AS [WuhanPilotUsualAlter],SUM([Discovery]) AS [Discovery] - ,SUM([HongKongPilot]) AS [HongKongPilot] - ,SUM([HuaXiaYunLian]) AS [HuaXiaYunLian],SUM([ZhuhaiPilot]) AS [ZhuhaiPilot],SUM([PilotSumAmount]) AS [PilotSumAmount],MAX(sort) sort + ,isnull( SUM([XCumulative]),0) AS [XCumulative], isnull(SUM([UsualAlterAmount]),0) AS [UsualAlterAmount],isnull(SUM([SiNO]),0) AS [SiNO], isnull(SUM([SiNOUsualAlter]),0) AS [SiNOUsualAlter] + ,isnull(SUM([WuhanPilotThisYear]),0) AS [WuhanPilotThisYear],isnull(SUM([WuhanPilotUsualAlter]),0) AS [WuhanPilotUsualAlter],isnull(SUM([Discovery]),0) AS [Discovery] + ,isnull(SUM([HongKongPilot]),0) AS [HongKongPilot] + ,isnull(SUM([HuaXiaYunLian]),0) AS [HuaXiaYunLian],isnull(SUM([ZhuhaiPilot]),0) AS [ZhuhaiPilot],isnull(SUM([PilotSumAmount]),0) AS [PilotSumAmount],MAX(sort) sort INTO {tableName} FROM {tableName}{guid} GROUP BY Salesperson,SBU,DetailArea diff --git a/ZPR_SalesRportShareData.sql b/ZPR_SalesRportShareData.sql index c3735b5..cebf81c 100644 --- a/ZPR_SalesRportShareData.sql +++ b/ZPR_SalesRportShareData.sql @@ -121,10 +121,13 @@ SELECT A.FID [ WHERE ( ( A.FSALEORGID = 100302 AND ( (ACO. != '̼ǿ' OR ACO. IS null ) AND (ACL. != '̼ǿ' OR ACL. IS null ) - AND C.FNAME NOT IN ('ŵƼۣ޹˾','人ŵƼչ޹˾') + AND ( C.FNAME NOT IN ('ŵƼۣ޹˾','人ŵƼչ޹˾','ͻ-ʹ' + ,'麣޹˾','㶫̼ǿؿƼ޹˾') + or ( C.FNAME='麣ŵԴ޹˾' AND (ACO. != 'Ŷ' OR ACO. IS null ) ) ) AND L.FNAME NOT IN ('ŵ','') ) AND EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid AND A.FManualClose <> '1' - AND BB.FManualRowClose <> '1' ) AND SUBSTRING([ֽʺͬ],1,1) != 'Z' ) OR A.FSALEORGID != 100302 ) AND A.FDocumentStatus = 'C' + AND BB.FManualRowClose <> '1' ) AND SUBSTRING(A.F_contractnumber,1,1) != 'Z' AND A.F_contractnumber NOT IN ('CYJSQD2024123118401','CYJSQD2025011518501') ) OR A.FSALEORGID != 100302 ) + AND A.FDocumentStatus = 'C' ) A WHERE [ܶ]<>0