成型报损原因 过滤停用 PDA

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -6524,7 +6524,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 		/// <remarks>
 		/// 2018.03.26          周兴          新建
 		/// </remarks>
-		public static ServiceResultEntity GetScrapReasonData(ClientRequestEntity cre, SUserInfo sUserInfo)
+		public static ServiceResultEntity GetScrapReasonData(ClientRequestEntity cre, SUserInfo sUserInfo, string valueFlag = null)
 		{
 			ServiceResultEntity result = new ServiceResultEntity();
 			DataSet returnData = new DataSet();
@@ -6532,16 +6532,32 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
 				try
-				{
-					string sqlString = "SELECT ScrapReasonID,ScrapReason,DisplayNo,ScrapType,Remarks,ValueFlag FROM TP_MST_ScrapReason "
-								+ " WHERE AccountID = :AccountID Order By DisplayNo";
-					oracleConn.Open();
-
-					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
-					{
-						new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
-					};
-					DataTable returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
+                {
+                    oracleConn.Open();
+                    DataTable returnTable;
+                    if (valueFlag == null)
+                    {
+                        string sqlString = "SELECT ScrapReasonID,ScrapReason,DisplayNo,ScrapType,Remarks,ValueFlag FROM TP_MST_ScrapReason "
+                                    + " WHERE AccountID = :AccountID Order By DisplayNo";
+
+                        OracleParameter[] oracleParameter = new OracleParameter[]
+                        {
+                            new OracleParameter(":AccountID",sUserInfo.AccountID)
+                        };
+                        returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
+                    }
+                    else
+                    {
+                        string sqlString = "SELECT ScrapReasonID,ScrapReason,DisplayNo,ScrapType,Remarks,ValueFlag FROM TP_MST_ScrapReason "
+                                    + " WHERE AccountID = :AccountID and valueflag = :valueflag Order By DisplayNo";
+
+                        OracleParameter[] oracleParameter = new OracleParameter[]
+                        {
+                            new OracleParameter(":AccountID",sUserInfo.AccountID),
+                            new OracleParameter(":valueflag",valueFlag)
+                        };
+                        returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
+                    }
 					returnTable.TableName = "TP_MST_ScrapReason";
 					oracleConn.Close();
 					returnData.Tables.Add(returnTable);

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -10099,7 +10099,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 						ClientRequestEntity cre = new ClientRequestEntity();
 						cre.NameSpace = module;
 						cre.Name = action;
-						ServiceResultEntity sre = SystemModuleLogic.GetScrapReasonData(cre, sUserInfo);
+						ServiceResultEntity sre = SystemModuleLogic.GetScrapReasonData(cre, sUserInfo, "1");
 						actionResult.Status = (int)Constant.PDAResult.Success;
 						actionResult.Result = JsonHelper.ToJson(sre.Data.Tables[0]);