整体质量分析表 增加 是否区分工号分组的条件

DK.Client/ReportModule/R04/M01/F_RPT_040109.cs

@@ -479,6 +479,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 se.CreateTimeStart = this.dtpAccountDateStart.Value;
                 se.CreateTimeEnd = this.dtpAccountDateEnd.Value;
 
+                se.HasUserGroup = this.chkUserGroup.Checked;
+
                 // 调用服务器端获取数据集
                 ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
                 {

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -5071,24 +5071,25 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				conn.Connect();
 
 				OracleParameter[] parameters = new OracleParameter[]
-				{
-					new OracleParameter("in_AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input),
-					new OracleParameter("in_DateBegin", OracleDbType.Date, se.CreateTimeStart, ParameterDirection.Input),
-					new OracleParameter("in_DateEnd", OracleDbType.Date, se.CreateTimeEnd, ParameterDirection.Input),
-					new OracleParameter("in_OutKilnProcedureID", OracleDbType.Int32, se.RptSProcedureID , ParameterDirection.Input),
-					new OracleParameter("in_KilnID", OracleDbType.Int32, se.KilnID , ParameterDirection.Input),
-					new OracleParameter("out_data1", OracleDbType.RefCursor, null , ParameterDirection.Output),
-					new OracleParameter("out_data2", OracleDbType.RefCursor, null , ParameterDirection.Output),
-					new OracleParameter("out_data3", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_data4", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_data21", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_data31", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_data32", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_table1", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_table2", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_table3", OracleDbType.RefCursor, null, ParameterDirection.Output),
-					new OracleParameter("out_table4", OracleDbType.RefCursor, null, ParameterDirection.Output),
-				};
+                {
+                    new OracleParameter("in_AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input),
+                    new OracleParameter("in_DateBegin", OracleDbType.Date, se.CreateTimeStart, ParameterDirection.Input),
+                    new OracleParameter("in_DateEnd", OracleDbType.Date, se.CreateTimeEnd, ParameterDirection.Input),
+                    new OracleParameter("in_OutKilnProcedureID", OracleDbType.Int32, se.RptSProcedureID , ParameterDirection.Input),
+                    new OracleParameter("in_KilnID", OracleDbType.Int32, se.KilnID , ParameterDirection.Input),
+                    new OracleParameter("out_data1", OracleDbType.RefCursor, null , ParameterDirection.Output),
+                    new OracleParameter("out_data2", OracleDbType.RefCursor, null , ParameterDirection.Output),
+                    new OracleParameter("out_data3", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_data4", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_data21", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_data31", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_data32", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_table1", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_table2", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_table3", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("out_table4", OracleDbType.RefCursor, null, ParameterDirection.Output),
+                    new OracleParameter("in_HasUserGroup", OracleDbType.Int32, (se.HasUserGroup?1:0), ParameterDirection.Input),
+                };
 
 				//out_data1 -- 质量整体情况
 				//out_data2 -- 各缺陷类型成品率
@@ -5102,9 +5103,10 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				//out_table3 -- 缺陷扣罚
 				//out_table4 -- 缺陷 
 
-				DataSet data = conn.ExecStoredProcedure("PRO_RPT_OverallQualityAnalysis", parameters);
-
-				ServiceResultEntity sre = new ServiceResultEntity();
+				//DataSet data = conn.ExecStoredProcedure("PRO_RPT_OverallQualityAnalysis", parameters);
+                DataSet data = conn.ExecStoredProcedure("PRO_RPT_OverallQualityA_UserG", parameters);
+                
+                ServiceResultEntity sre = new ServiceResultEntity();
 				if (data == null || data.Tables.Count == 0 || data.Tables[0].Rows.Count == 0)
 				{
 					sre.Status = Constant.ServiceResultStatus.NoSearchResults;

WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT040109_SE.cs

@@ -69,5 +69,11 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set;
         }
 
+        [DataMember]
+        public bool HasUserGroup
+        {
+            get;
+            set;
+        }
     }
 }