Merge branch 'master' of http://git.dongkesoft.com:9001/imex/dk.imex.mes

DK.Client/PMModule/F_PM_0906.cs

@@ -214,6 +214,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 ClientRequestEntity cre = new ClientRequestEntity();
                 cre.NameSpace = "MST_ScrapReason";
                 cre.Name = "GetScrapReasonData";
+                cre.Properties["ALL"] = "1";
                 ServiceResultEntity result = new ServiceResultEntity();
                 result = (ServiceResultEntity)DoAsync(new BaseAsyncMethod(() => { return SystemModuleProxy.Service.DoBarCodePrint(cre); }));
                 // 没有数据时，直接返回

DK.Client/PMModule/F_PM_2702.cs

@@ -96,7 +96,8 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 					return;
 				}
 				_scrapReasonTable = result.Data.Tables[0];
-				this.cboRreason.DisplayMember = "ScrapReason";
+                //_scrapReasonTable.DefaultView.RowFilter = "valueflag='1'";
+                this.cboRreason.DisplayMember = "ScrapReason";
 				this.cboRreason.ValueMember = "ScrapReasonID";
 				this.chkScrapTypeOne.Checked = false;
 
@@ -235,7 +236,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 
 				if (_scrapReasonTable != null && _scrapReasonTable.Rows.Count > 0)
 				{
-					_scrapReasonTable.DefaultView.RowFilter = "ScrapType = '" + scrapType + "'";
+					_scrapReasonTable.DefaultView.RowFilter = "ScrapType = '" + scrapType + "' and valueflag='1'";
 					DataTable returnTable = _scrapReasonTable.DefaultView.ToTable();
 					_scrapReasonTable.DefaultView.RowFilter = string.Empty;
 					this.cboRreason.DataSource = returnTable;

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -6537,16 +6537,33 @@ 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;
+                    string isALL = cre.Properties["ALL"] + "";
+                    if (isALL == "1")
+                    {
+                        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","1")
+                        };
+                        returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
+                    }
 					returnTable.TableName = "TP_MST_ScrapReason";
 					oracleConn.Close();
 					returnData.Tables.Add(returnTable);

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.20.0423")]
-[assembly: AssemblyFileVersion("1.3.20.0423")]
+[assembly: AssemblyVersion("1.0.20.0423")]
+[assembly: AssemblyFileVersion("1.0.20.0423")]