Просмотр исходного кода

撤销更改,方案改为修改存储过程

liusq 4 лет назад
Родитель
Сommit
41edd5aace
1 измененных файлов с 7 добавлено и 15 удалено
  1. 7 15
      DK.Service/ReportModuleLogic/ReportModuleLogic.cs

+ 7 - 15
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -5331,32 +5331,24 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
 				conn.Connect();
 
-				DataSet data = null;
-				if (se.IsShowG)
+				OracleParameter[] parameters = new OracleParameter[]
 				{
-					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("in_Kilncarbatchno", OracleDbType.Varchar2, se.Kilncarbatchno , ParameterDirection.Input),
 					new OracleParameter("out_data1", OracleDbType.RefCursor, null , ParameterDirection.Output),
-					};
+				};
+
+				DataSet data = null;
+				if (se.IsShowG)
+				{
 					data = conn.ExecStoredProcedure("PRO_RPT_OverallQualityDetail_G", parameters);
 				}
 				else
 				{
-					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("in_Kilncarbatchno", OracleDbType.Varchar2, se.Kilncarbatchno , ParameterDirection.Input),
-					new OracleParameter("out_data1", OracleDbType.RefCursor, null , ParameterDirection.Output),
-					};
 					data = conn.ExecStoredProcedure("PRO_RPT_OverallQualityDetail", parameters);
 				}