成型报损原因 过滤停用 PDA

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -6586,41 +6586,57 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			}
 		}
 
-		#endregion
-
-		#region 成型破损
-		/// <summary>
-		/// 获取成型破损原因左侧树的数据
-		/// </summary>
-		/// <returns>DataSet</returns>
-		/// <remarks>
-		/// 2018.03.26          周兴          新建
-		/// </remarks>
-		public static ServiceResultEntity GetScrapReasonData(ClientRequestEntity cre, SUserInfo sUserInfo)
-		{
-			ServiceResultEntity result = new ServiceResultEntity();
-			DataSet returnData = new DataSet();
-			try
-			{
-				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();
+        #endregion
 
-					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
-					{
-						new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
-					};
-					DataTable returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
-					returnTable.TableName = "TP_MST_ScrapReason";
-					oracleConn.Close();
-					returnData.Tables.Add(returnTable);
-					result.Data = returnData;
-					return result;
-				}
-				catch (Exception ex)
+        #region 成型破损
+        /// <summary>
+        /// 获取成型破损原因左侧树的数据
+        /// </summary>
+        /// <returns>DataSet</returns>
+        /// <remarks>
+        /// 2018.03.26          周兴          新建
+        /// </remarks>
+        public static ServiceResultEntity GetScrapReasonData(ClientRequestEntity cre, SUserInfo sUserInfo, string valueFlag = null)
+        {
+            ServiceResultEntity result = new ServiceResultEntity();
+            DataSet returnData = new DataSet();
+            try
+            {
+                IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+                try
+                {
+                    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);
+                    result.Data = returnData;
+                    return result;
+                }
+                catch (Exception ex)
 				{
 					if (oracleConn.ConnState == ConnectionState.Open)
 					{

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -10148,7 +10148,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]);