From d961feee4ed3a9871c6cb72c76b4d67ab2491069 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Wed, 2 Apr 2025 10:17:45 +0800
Subject: [PATCH] 111

---
 .../AnnualSalesPaymentSumReport.cs            | 126 ++++++++++--------
 ZPR_SalesRportShareData.sql                   |   6 +-
 2 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
index 275fdf4..aca6fe0 100644
--- a/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
+++ b/Pilot.Report.Exploitation/AnnualSalesPaymentSum/AnnualSalesPaymentSumReport.cs
@@ -73,7 +73,7 @@ namespace Pilot.Report.Exploitation.AnnualSalesPaymentSum
             header.AddChild("H1Month", new LocaleValue("1月(回款额)"), SqlStorageType.SqlDecimal);
             header.AddChild("X2Month", new LocaleValue("2月(销售额)"), SqlStorageType.SqlDecimal);
             header.AddChild("H2Month", new LocaleValue("2月(回款额)"), SqlStorageType.SqlDecimal);
-            header.AddChild("X2Month", new LocaleValue("3月(销售额)"), SqlStorageType.SqlDecimal);
+            header.AddChild("X3Month", new LocaleValue("3月(销售额)"), SqlStorageType.SqlDecimal);
             header.AddChild("H3Month", new LocaleValue("3月(回款额)"), SqlStorageType.SqlDecimal);
             header.AddChild("X4Month", new LocaleValue("4月(销售额)"), SqlStorageType.SqlDecimal);
             header.AddChild("H4Month", new LocaleValue("4月(回款额)"), SqlStorageType.SqlDecimal);
@@ -1389,15 +1389,17 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[ZhuhaiPilot],[PilotSumAmount],FID,FIDENTITYID,sort
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID)
- SELECT [sbu]+'小计' , 99383320 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , 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(FID)+1 AS FID ,MAX(FIDENTITYID)+1 AS FIDENTITYID ,1 as sort
+ SELECT [sbu]+'小计' , 99383320 ,'','', isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
+ , 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(FID)+1 AS FID ,MAX(FIDENTITYID)+1 AS FIDENTITYID ,1 as sort
  ,0 as 累计销售额, 0 [累计回款额],0 [往年订单变更金额],0 [兴诺业绩],0 [兴诺往年订单变更],0 [武汉派诺-当年业绩],0 [武汉派诺-往年订单变更],0 [碳索业绩]
  ,0 [香港派诺业绩],0 [华夏云联业绩], 100302 [组织ID]
  FROM {tableName}{guid} 
@@ -1412,17 +1414,19 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
  
- SELECT '派诺集团合计（行业线+SBU+诺瓦数能+事业部+OEM配套组+EMT团队+其他+各子公司）' , 99383322 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , 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],(SELECT MAX(FID) FROM  {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM  {tableName}{guid} )+1  AS FIDENTITYID ,2 as sort
+ SELECT '派诺集团合计（行业线+SBU+诺瓦数能+事业部+OEM配套组+EMT团队+其他+各子公司）' , 99383322 ,'','',isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
+ , 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],(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([碳索业绩])  [碳索业绩]
- ,SUM([香港派诺业绩]) [香港派诺业绩],SUM([华夏云联业绩])  [华夏云联业绩],100302 as [组织ID]
+ , isnull(SUM([香港派诺业绩]),0) [香港派诺业绩], isnull(SUM([华夏云联业绩]),0)  [华夏云联业绩],100302 as [组织ID]
  FROM {tableName}{guid} 
  where [销售员ID]<99383300 AND 组织ID=100302
 
@@ -1444,11 +1448,13 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
   
- SELECT '一、珠海兴诺合计' , 99383323 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month
- , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month
- , SUM(X12Month) AS X12Month  , SUM(H12Month) AS H12Month 
+ SELECT '一、珠海兴诺合计' , 99383323 ,'','',isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
 , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter]
  ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery]
  ,0 AS [HongKongPilot]
@@ -1467,11 +1473,13 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
   
- SELECT '二、华夏云联合计' , 99383324 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month
- , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month
- , SUM(X12Month) AS X12Month  , SUM(H12Month) AS H12Month 
+ SELECT '二、华夏云联合计' , 99383324 ,'','',isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
  , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter]
  ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery]
  ,0 AS [HongKongPilot]
@@ -1490,11 +1498,13 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
   
- SELECT '三、香港派诺合计' , 99383325 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month
- , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month
- , SUM(X12Month) AS X12Month  , SUM(H12Month) AS H12Month 
+ SELECT '三、香港派诺合计' , 99383325 ,'','', isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
  , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter]
  ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery]
  ,0 AS [HongKongPilot]
@@ -1514,11 +1524,13 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
   
- SELECT '四、碳索合计' , 99383326 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month
- , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month
- , SUM(X12Month) AS X12Month  , SUM(H12Month) AS H12Month 
+ SELECT '四、碳索合计' , 99383326 ,'','',isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
  , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter]
  ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery]
  ,0 AS [HongKongPilot]
@@ -1537,11 +1549,13 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
   
- SELECT '五、武汉派诺合计' , 99383327 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , SUM(X10Month) AS X10Month,SUM(H10Month) AS H10Month
- , SUM(X11Month) AS X11Month,SUM(H11Month) AS H11Month
- , SUM(X12Month) AS X12Month  , SUM(H12Month) AS H12Month 
+ SELECT '五、武汉派诺合计' , 99383327 ,'','',isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
 , 0 AS [XCumulative], 0 AS [UsualAlterAmount],0 AS [SiNO], 0 AS [SiNOUsualAlter]
  ,0 AS [WuhanPilotThisYear],0 AS [WuhanPilotUsualAlter],0 AS [Discovery]
  ,0 AS [HongKongPilot]
@@ -1561,17 +1575,19 @@ AND AA.[订单日期] >='{yearStart}' AND AA.[订单日期] <'{yearEnd}') kk
 ,[累计销售额],[累计回款额],[往年订单变更金额],[兴诺业绩],[兴诺往年订单变更],[武汉派诺-当年业绩],[武汉派诺-往年订单变更],[碳索业绩],[香港派诺业绩],[华夏云联业绩]
 ,组织ID )
  
- SELECT '派诺集团总计（一+二+三）' , 99383328 ,'','', SUM(X1Month) AS X1Month,SUM(H1Month) AS H1Month, SUM(X2Month) AS X2Month,SUM(H2Month) AS H2Month, SUM(X3Month) AS X3Month,SUM(H3Month) AS H3Month, SUM(X4Month) AS X4Month,SUM(H4Month) AS H4Month
- , SUM(X5Month) AS X5Month,SUM(H5Month) AS H5Month, SUM(X6Month) AS X6Month,SUM(H6Month) AS H6Month, SUM(X7Month) AS X7Month,SUM(H7Month) AS H7Month, SUM(X8Month) AS X8Month, SUM(h8Month) AS h8Month,SUM(X9Month) AS X9Month,SUM(H9Month) AS H9Month
- , 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],(SELECT MAX(FID) FROM  {tableName}{guid} )+1 +1 AS FID ,(SELECT MAX(FID) FROM  {tableName}{guid} )+1  AS FIDENTITYID ,4 as sort
+ SELECT '派诺集团总计（一+二+三）' , 99383328 ,'','', isnull(SUM(X1Month),0) AS X1Month,isnull(SUM(H1Month),0) AS H1Month, isnull(SUM(X2Month),0) AS X2Month,isnull(SUM(H2Month),0) AS H2Month, isnull(SUM(X3Month),0) AS X3Month
+,isnull(SUM(H3Month),0) AS H3Month, isnull(SUM(X4Month),0) AS X4Month,isnull(SUM(H4Month),0) AS H4Month
+ , isnull(SUM(X5Month),0) AS X5Month,isnull(SUM(H5Month),0) AS H5Month, isnull(SUM(X6Month),0) AS X6Month,isnull(SUM(H6Month),0) AS H6Month, isnull(SUM(X7Month),0) AS X7Month
+,isnull(SUM(H7Month),0) AS H7Month, isnull(SUM(X8Month),0) AS X8Month, isnull(SUM(h8Month),0) AS h8Month,isnull(SUM(X9Month),0) AS X9Month,isnull(SUM(H9Month),0) AS H9Month
+ , isnull(SUM(X10Month),0) AS X10Month,isnull(SUM(H10Month),0) AS H10Month
+ , isnull(SUM(X11Month),0) AS X11Month,isnull(SUM(H11Month),0) AS H11Month
+ , isnull(SUM(X12Month),0) AS X12Month  , isnull(SUM(H12Month),0) AS H12Month 
+ , 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],(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([碳索业绩])  [碳索业绩]
- ,SUM([香港派诺业绩]) [香港派诺业绩],SUM([华夏云联业绩])  [华夏云联业绩],999999 as [组织ID]
+ ,  isnull(SUM([香港派诺业绩]),0) [香港派诺业绩], isnull(SUM([华夏云联业绩]),0)  [华夏云联业绩] ,999999 as [组织ID]
  FROM {tableName}{guid} 
  where [销售员ID] IN (99383327,99383326,99383325,99383324,99383323,99383322) 
 ";
diff --git a/ZPR_SalesRportShareData.sql b/ZPR_SalesRportShareData.sql
index f2d5468..c3735b5 100644
--- a/ZPR_SalesRportShareData.sql
+++ b/ZPR_SalesRportShareData.sql
@@ -122,12 +122,12 @@ SELECT   A.FID [
   (ACO.���� != '̼���ǿ�'  OR  ACO.���� IS null  )                      
  AND (ACL.���� != '̼���ǿ�'    OR     ACL.���� IS null                              )
  AND C.FNAME  NOT IN ('��ŵ�Ƽ�����ۣ����޹�˾','�人��ŵ�Ƽ���չ���޹�˾')                                      
- AND L.FNAME NOT IN  ('��ŵ��','������')   )) OR   A.FSALEORGID != 100302)    AND A.FDocumentStatus = 'C'                
+ 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 BB.FManualRowClose <> '1'  ) AND SUBSTRING([ֽ�ʺ�ͬ��],1,1) != 'Z' )  OR   A.FSALEORGID != 100302 )   AND A.FDocumentStatus = 'C'  
  ) A
   
-   WHERE [���������ܶ�]<>0  AND SUBSTRING([ֽ�ʺ�ͬ��],1,1) != 'Z'  
+   WHERE [���������ܶ�]<>0   
    ORDER BY A.[���۵�����ID],[����ԱID]
      
 UPDATE [ZZZ_SalesRportShareData] SET [�����ܶ�]=[���������ܶ�]*[��̯����]*0.01,[�ۼƷ������]=[�����ۼƷ������]*[��̯����]*0.01,[�ۼ��˻����]=[�����ۼ��˻����]*[��̯����]*0.01