chenxy 6 سال پیش
والد
کامیت
b96b38a6ce
63فایلهای تغییر یافته به همراه383 افزوده شده و 346 حذف شده
  1. 2 2
      DK.Basics/DataAccess/CommandInfo.cs
  2. 2 3
      DK.Basics/DataAccess/DataAccess.csproj
  3. 1 1
      DK.Basics/DataAccess/DataManager.cs
  4. 1 1
      DK.Basics/DataAccess/OracleDB.cs
  5. 1 1
      DK.Basics/DataAccess/OracleDBConnection.cs
  6. 1 1
      DK.Basics/DataAccess/OracleDBTransaction.cs
  7. 1 1
      DK.Basics/DataAccess/OracleHelper.cs
  8. 18 0
      DK.Client/PPModule/PPModule.csproj
  9. 4 4
      DK.Service/BarcodePrintService/BarcodePrintLogic.cs
  10. 2 3
      DK.Service/BarcodePrintService/BarcodePrintService.csproj
  11. 1 1
      DK.Service/CMNModuleService/CMNModuleLogic.cs
  12. 2 2
      DK.Service/CMNModuleService/CMNModuleService.csproj
  13. 11 11
      DK.Service/CommonModuleLogic/CommonModuleLogic.cs
  14. 2 2
      DK.Service/CommonModuleLogic/CommonModuleLogic.csproj
  15. 1 1
      DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs
  16. 2 2
      DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.csproj
  17. 1 1
      DK.Service/HRModuleLogic/HRModuleDAL.cs
  18. 1 1
      DK.Service/HRModuleLogic/HRModuleLogic.cs
  19. 2 2
      DK.Service/HRModuleLogic/HRModuleLogic.csproj
  20. 1 1
      DK.Service/PAMModuleService/PAMModuleDAL.cs
  21. 3 3
      DK.Service/PAMModuleService/PAMModuleLogic.cs
  22. 2 2
      DK.Service/PAMModuleService/PAMModuleService.csproj
  23. 1 1
      DK.Service/PCModuleLogic/PCModuleLogic.cs
  24. 2 2
      DK.Service/PCModuleLogic/PCModuleLogic.csproj
  25. 1 1
      DK.Service/PCModuleLogic/PCModuleLogicDAL.cs
  26. 1 1
      DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs
  27. 1 1
      DK.Service/PCModuleLogic/PCModuleLogicPartial.cs
  28. 1 1
      DK.Service/PCModuleService/PCModuleLogic.cs
  29. 2 2
      DK.Service/PCModuleService/PCModuleService.csproj
  30. 28 28
      DK.Service/PDAModuleLogic/PDAModuleLogic.cs
  31. 2 2
      DK.Service/PDAModuleLogic/PDAModuleLogic.csproj
  32. 1 1
      DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs
  33. 5 5
      DK.Service/PMModuleLogic/PMModuleLogic.cs
  34. 2 2
      DK.Service/PMModuleLogic/PMModuleLogic.csproj
  35. 1 1
      DK.Service/PMModuleLogic/PMModuleLogicDAL.cs
  36. 5 5
      DK.Service/PMModuleLogic/PMModuleLogicDALPartial.cs
  37. 1 1
      DK.Service/PMModuleLogic/PMModuleLogicNew.cs
  38. 5 5
      DK.Service/PMModuleLogic/PMModuleLogicPartial.cs
  39. 1 1
      DK.Service/PMModuleService/PMModuleLogic.cs
  40. 2 2
      DK.Service/PMModuleService/PMModuleService.csproj
  41. 1 1
      DK.Service/PPModuleService/PPModuleLogic.cs
  42. 21 5
      DK.Service/PPModuleService/PPModuleService.csproj
  43. 1 1
      DK.Service/PublicModuleService/PublicModuleLogic.cs
  44. 2 2
      DK.Service/PublicModuleService/PublicModuleService.csproj
  45. 12 12
      DK.Service/ReportModuleLogic/ReportModuleLogic.cs
  46. 2 2
      DK.Service/ReportModuleLogic/ReportModuleLogic.csproj
  47. 1 1
      DK.Service/SAPDataService/SAPDataLogic.cs
  48. 2 2
      DK.Service/SAPDataService/SAPHegiiDataService.csproj
  49. 1 1
      DK.Service/SmartDeviceService/PLCModuleLogic.cs
  50. 1 1
      DK.Service/SmartDeviceService/SmartDeviceLogic.cs
  51. 2 2
      DK.Service/SmartDeviceService/SmartDeviceService.csproj
  52. 59 59
      DK.Service/SystemModuleLogic/SystemModuleDAL.cs
  53. 132 132
      DK.Service/SystemModuleLogic/SystemModuleLogic.cs
  54. 2 2
      DK.Service/SystemModuleLogic/SystemModuleLogic.csproj
  55. 1 1
      DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs
  56. 1 1
      DK.Service/TATModuleLogic/TATModuleLogic.cs
  57. 2 2
      DK.Service/TATModuleLogic/TATModuleLogic.csproj
  58. 1 1
      DK.Service/TATModuleLogic/TATModuleLogicDAL.cs
  59. 1 1
      DK.Service/TATModuleLogic/TATModuleLogicDALPartial.cs
  60. 1 1
      DK.Service/TATModuleLogic/TATModuleLogicPartial.cs
  61. BIN
      DLL/Oracle.ManagedDataAccess.dll
  62. 9 8
      IBOSS.PRD.sln
  63. 4 0
      WCF.Service/WCF.Hosting/WCF.Hosting.csproj

+ 2 - 2
DK.Basics/DataAccess/CommandInfo.cs

@@ -76,12 +76,12 @@ namespace Dongke.IBOSS.PRD.Basics.DataAccess
         {
 
         }
-        public CommandInfo(string sqlText, Oracle.DataAccess.Client.OracleParameter[] para)
+        public CommandInfo(string sqlText, Oracle.ManagedDataAccess.Client.OracleParameter[] para)
         {
             this.CommandText = sqlText;
             this.Parameters = para;
         }
-        public CommandInfo(string sqlText, Oracle.DataAccess.Client.OracleParameter[] para, EffentNextType type)
+        public CommandInfo(string sqlText, Oracle.ManagedDataAccess.Client.OracleParameter[] para, EffentNextType type)
         {
             this.CommandText = sqlText;
             this.Parameters = para;

+ 2 - 3
DK.Basics/DataAccess/DataAccess.csproj

@@ -97,9 +97,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess">
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 1 - 1
DK.Basics/DataAccess/DataManager.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 //using System.Data.OracleClient;
 using System.Data.SqlClient;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Basics.DataAccess
 {

+ 1 - 1
DK.Basics/DataAccess/OracleDB.cs

@@ -16,7 +16,7 @@ using System.Text;
 using System.Collections;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Basics.DataAccess
 {

+ 1 - 1
DK.Basics/DataAccess/OracleDBConnection.cs

@@ -13,7 +13,7 @@ using System.Collections;
 using System.Data;
 using System.IO;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Basics.DataAccess
 {

+ 1 - 1
DK.Basics/DataAccess/OracleDBTransaction.cs

@@ -14,7 +14,7 @@ using System.Data;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Basics.DataAccess
 {

+ 1 - 1
DK.Basics/DataAccess/OracleHelper.cs

@@ -14,7 +14,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 //using System.Data.OracleClient;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Basics.DataAccess
 {

+ 18 - 0
DK.Client/PPModule/PPModule.csproj

@@ -38,6 +38,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 4 - 4
DK.Service/BarcodePrintService/BarcodePrintLogic.cs

@@ -14,7 +14,7 @@ using System.Data;
 using System.Drawing;
 using System.Drawing.Printing;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
@@ -350,10 +350,10 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                 "   AND bp.accountid = :accountid\n" +
                 " ORDER BY nvl2(u.userid, 0, 1), bp.displayno";
 
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":userid",sUserInfo.UserID),
-                    new Oracle.DataAccess.Client.OracleParameter(":accountid",sUserInfo.AccountID),
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":userid",sUserInfo.UserID),
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountid",sUserInfo.AccountID),
                 };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);

+ 2 - 3
DK.Service/BarcodePrintService/BarcodePrintService.csproj

@@ -83,9 +83,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=2.112.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess">
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 1 - 1
DK.Service/CMNModuleService/CMNModuleLogic.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;

+ 2 - 2
DK.Service/CMNModuleService/CMNModuleService.csproj

@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 11 - 11
DK.Service/CommonModuleLogic/CommonModuleLogic.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
 {
@@ -41,10 +41,10 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string strSql1 = "Select * From TP_MST_SYSTEMSETTING Where SettingCode = :settingType And accountid = :accountId";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":settingType",pSettingType),
-                    new Oracle.DataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":settingType",pSettingType),
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
                 };
                 #endregion
                 oracleConn.Open();
@@ -81,9 +81,9 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
                 };
                 #endregion
                 oracleConn.Open();
@@ -126,9 +126,9 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
                 };
                 #endregion
                 object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
@@ -163,7 +163,7 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
                     string strSql = "select SystemDateType,DateValue From TP_MST_SystemDate where AccountID=:accountID";
                     OracleParameter[] paras = new OracleParameter[] 
                     {
-                        new Oracle.DataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",sUserInfo.AccountID)
                     };
                     DataTable dt = oracleConn.GetSqlResultToDt(strSql, paras);
                     if (dt != null && dt.Rows.Count > Constant.INT_IS_ZERO)
@@ -232,9 +232,9 @@ namespace Dongke.IBOSS.PRD.Service.CommonModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string strSql1 = "SELECT PostID,PostCode,PostName,Remarks FROM TP_MST_Post WHERE accountid = :in_accountid AND valueflag = 1";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":in_accountid",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":in_accountid",sUserInfo.AccountID)
                 };
                 #endregion
                 oracleConn.Open();

+ 2 - 2
DK.Service/CommonModuleLogic/CommonModuleLogic.csproj

@@ -76,9 +76,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.cs

@@ -16,7 +16,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic
 {

+ 2 - 2
DK.Service/DKIBOSSPRDLogic/DKIBOSSPRDLogic.csproj

@@ -81,9 +81,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.JScript" />
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="SharpZipLib">
       <HintPath>DLL\SharpZipLib.dll</HintPath>

+ 1 - 1
DK.Service/HRModuleLogic/HRModuleDAL.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.HRModuleLogic
 {

+ 1 - 1
DK.Service/HRModuleLogic/HRModuleLogic.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.HRModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.HRModuleLogic
 {

+ 2 - 2
DK.Service/HRModuleLogic/HRModuleLogic.csproj

@@ -76,9 +76,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PAMModuleService/PAMModuleDAL.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using Dongke.IBOSS.PRD.WCF.DataModels.PAMModule;
 using System.Collections;
 

+ 3 - 3
DK.Service/PAMModuleService/PAMModuleLogic.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PAMModule;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PAMModuleService
 {
@@ -274,9 +274,9 @@ namespace Dongke.IBOSS.PRD.Service.PAMModuleService
             {
                 string sqlString = "Select WagesTypeID,WagesTypeName,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
                                   + "from TP_PAM_WagesType where AccountID = :AccountID";
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                    {
-                    new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
                    };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);

+ 2 - 2
DK.Service/PAMModuleService/PAMModuleService.csproj

@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PCModuleLogic/PCModuleLogic.cs

@@ -16,7 +16,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.ConfigModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 {

+ 2 - 2
DK.Service/PCModuleLogic/PCModuleLogic.csproj

@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PCModuleLogic/PCModuleLogicDAL.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PCModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 {

+ 1 - 1
DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 {

+ 1 - 1
DK.Service/PCModuleLogic/PCModuleLogicPartial.cs

@@ -14,7 +14,7 @@ using System.Data;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
 {

+ 1 - 1
DK.Service/PCModuleService/PCModuleLogic.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;

+ 2 - 2
DK.Service/PCModuleService/PCModuleService.csproj

@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 28 - 28
DK.Service/PDAModuleLogic/PDAModuleLogic.cs

@@ -24,7 +24,7 @@ using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.HRModule;
 using Dongke.IBOSS.PRD.WCF.DataModels.PCModule;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 {
@@ -795,26 +795,26 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             try
             {
                 string sqlString = String.Empty;
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
                 if (Pvalue.ToString() == Constant.INT_IS_ONE.ToString())
                 {
                     sqlString = "Select DictionaryID,DictionaryType,DictionaryValue,DisplayNo,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
                                + "UpdateUserID,OPTimeStamp from TP_MST_DataDictionary where DictionaryType = :DictionaryType and AccountID = :AccountID";
-                    oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                    oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                           {
-                            new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-                            new Oracle.DataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
+                            new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+                            new Oracle.ManagedDataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
                            };
                 }
                 else if (Pvalue.ToString() == Constant.INT_IS_ZERO.ToString())
                 {
                     sqlString = "Select DictionaryID,DictionaryType,DictionaryValue,DisplayNo,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
                           + "UpdateUserID,OPTimeStamp from TP_MST_DataDictionary where valueflag = :valueflag and DictionaryType = :DictionaryType and AccountID = :AccountID";
-                    oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                    oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                            {
-                                new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-                                new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-                                new Oracle.DataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
                             };
                 }
                 oracleConn.Open();
@@ -1477,9 +1477,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                     ll = 2;
                     //string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
                     string strSql1 = "select sysdate from dual";
-                    //    Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                    //    Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                     //{
-                    //    new Oracle.DataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+                    //    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
                     //};
                     object strResult = oracleTrConn.GetSqlResultToObj(strSql1);
                     if (strResult == null || strResult == DBNull.Value)
@@ -2234,9 +2234,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 {
                     object result = DBNull.Value;
                     string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-                    Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[]
+                    Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                     {
-                        new Oracle.DataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
                     };
                     object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
                     if (strResult == null || strResult == DBNull.Value)
@@ -2703,9 +2703,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 //获取窑炉管理数据
                 string sqlString = "Select KilnID,KilnCode,KilnName,KilnType,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
                                     + "from TP_MST_Kiln where AccountID = :AccountID and valueflag=1";
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                    {
-                    new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
                    };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2737,9 +2737,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             {
                 //获取窑炉管理数据
                 string sqlString = "Select barcode from TP_PM_InProductionTrash where barcode=:barcode";
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                    {
-                    new Oracle.DataAccess.Client.OracleParameter(":barcode",barcode)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":barcode",barcode)
                    };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2776,9 +2776,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 string sqlString = "select IsReFire from tp_PM_ProductionData where ProductionDataid=(select max(ProductionDataid) from tp_PM_ProductionData where barcode=:barcode)";
                 //获取窑炉管理数据
                 //string sqlString = "Select IsReFire from TP_PM_InProduction where barcode=:barcode";
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                    {
-                    new Oracle.DataAccess.Client.OracleParameter(":barcode",barcode)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":barcode",barcode)
                    };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2952,10 +2952,10 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 DataSet dsReturn = new DataSet();
                 string strSql = "";
                 strSql = @"select userid,username,usercode from tp_mst_user where tp_mst_user.isworker=1 and valueflag=1 and accountid=:accountid and usercode=:usercode";
-                Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+                Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                    {
-                    new Oracle.DataAccess.Client.OracleParameter(":accountid",userInfo.AccountID),
-                    new Oracle.DataAccess.Client.OracleParameter(":usercode",usercode)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountid",userInfo.AccountID),
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":usercode",usercode)
                    };
                 DataSet ds = con.GetSqlResultToDs(strSql, oracleParameter);
                 ds.Tables[0].TableName = "TUser";
@@ -2963,9 +2963,9 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 
                 //strSql = "Select DictionaryID,DictionaryValue"
                 //             + " from TP_MST_DataDictionary where valueflag = 1 and DictionaryType = 'ASE002' and AccountID = :AccountID";
-                //oracleParameter = new Oracle.DataAccess.Client.OracleParameter[] 
+                //oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 //           {
-                //                new Oracle.DataAccess.Client.OracleParameter(":AccountID",userInfo.AccountID),
+                //                new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",userInfo.AccountID),
                 //            };
                 //DataSet ds2 = con.GetSqlResultToDs(strSql, oracleParameter);
                 //ds2.Tables[0].TableName = "TDataDictionary";
@@ -4766,18 +4766,18 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 
                 //sqlString = "Select DictionaryID,DictionaryValue"
                 //            + " from TP_MST_DataDictionary where valueflag = 1 and DictionaryType = 'ASE002' and AccountID = :AccountID";
-                //paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                //paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 //           {
-                //                new Oracle.DataAccess.Client.OracleParameter(":AccountID",accountid),
+                //                new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",accountid),
                 //            };
                 //DataSet ds2 = con.GetSqlResultToDs(sqlString, paras);
                 //ds2.Tables[0].TableName = "TDataDictionary";
 
                 sqlString = "select procedureid,jobsid from TP_PC_DefectProcedureJobs where TP_PC_DefectProcedureJobs.Defectid=:Defectid";
 
-                paras = new Oracle.DataAccess.Client.OracleParameter[]
+                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                            {
-                                new Oracle.DataAccess.Client.OracleParameter(":Defectid",defectid),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":Defectid",defectid),
                             };
                 DataSet ds3 = con.GetSqlResultToDs(sqlString, paras);
                 ds3.Tables[0].TableName = "TP_PC_DefectProcedureJobs";

+ 2 - 2
DK.Service/PDAModuleLogic/PDAModuleLogic.csproj

@@ -88,9 +88,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DK.Basics\Library\Dll\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

+ 1 - 1
DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -24,7 +24,7 @@ using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.HRModule;
 using Dongke.IBOSS.PRD.WCF.DataModels.PCModule;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using Newtonsoft.Json.Linq;
 
 namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic

+ 5 - 5
DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -20,7 +20,7 @@ using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 {
@@ -466,18 +466,18 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
                 //sqlString = "Select DictionaryID,DictionaryValue"
                 //            + " from TP_MST_DataDictionary where valueflag = 1 and DictionaryType = 'ASE002' and AccountID = :AccountID";
-                //paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                //paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 //           {
-                //                new Oracle.DataAccess.Client.OracleParameter(":AccountID",accountid),
+                //                new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",accountid),
                 //            };
                 //DataSet ds2 = con.GetSqlResultToDs(sqlString, paras);
                 //ds2.Tables[0].TableName = "TDataDictionary";
 
                 sqlString = "select procedureid,jobsid from TP_PC_DefectProcedureJobs where TP_PC_DefectProcedureJobs.Defectid=:Defectid";
 
-                paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                            {
-                                new Oracle.DataAccess.Client.OracleParameter(":Defectid",defectid),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":Defectid",defectid),
                             };
                 DataSet ds3 = con.GetSqlResultToDs(sqlString, paras);
                 ds3.Tables[0].TableName = "TP_PC_DefectProcedureJobs";

+ 2 - 2
DK.Service/PMModuleLogic/PMModuleLogic.csproj

@@ -79,9 +79,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 {

+ 5 - 5
DK.Service/PMModuleLogic/PMModuleLogicDALPartial.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 {
@@ -1301,9 +1301,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				{
 					//string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
 					string strSql1 = "select sysdate from dual";
-					//    Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+					//    Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
 					//{
-					//    new Oracle.DataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+					//    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
 					//};
 					object strResult = oracleTrConn.GetSqlResultToObj(strSql1);
 					if (strResult == null || strResult == DBNull.Value)
@@ -1889,9 +1889,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				{
 					object result = DBNull.Value;
 					string strSql1 = "select FUN_CMN_GetAccountDate(:accountId) From DUAL";
-					Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[]
+					Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
-						new Oracle.DataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
+						new Oracle.ManagedDataAccess.Client.OracleParameter(":accountId",userInfo.AccountID)
 					};
 					object strResult = oracleTrConn.GetSqlResultToObj(strSql1, paras1);
 					if (strResult == null || strResult == DBNull.Value)

+ 1 - 1
DK.Service/PMModuleLogic/PMModuleLogicNew.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;

+ 5 - 5
DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -20,7 +20,7 @@ using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 {
@@ -1055,9 +1055,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 			{
 				//获取窑炉管理数据
 				string sqlString = "Select barcode from TP_PM_InProductionTrash where barcode=:barcode";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":barcode",barcode)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":barcode",barcode)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2619,9 +2619,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				//获取窑炉管理数据
 				//string sqlString = "Select IsReFire from TP_PM_InProduction where barcode=:barcode";
 				string sqlString = "select IsReFire from tp_PM_ProductionData where ProductionDataid=(select max(ProductionDataid) from tp_PM_ProductionData where barcode=:barcode)";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":barcode",barcode)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":barcode",barcode)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);

+ 1 - 1
DK.Service/PMModuleService/PMModuleLogic.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Service.CMNModuleService;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.WinForm.Utilities;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PMModuleService
 {

+ 2 - 2
DK.Service/PMModuleService/PMModuleService.csproj

@@ -78,9 +78,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DK.Basics\Library\Dll\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PPModuleService/PPModuleLogic.cs

@@ -13,7 +13,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Text;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.CMNModuleService;

+ 21 - 5
DK.Service/PPModuleService/PPModuleService.csproj

@@ -38,12 +38,28 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.DataAccess">
-      <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.DataAccess">
-      <HintPath>..\..\..\..\..\..\oracle\product\18.0.0\client_1\odp.net\bin\4\Oracle.DataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/PublicModuleService/PublicModuleLogic.cs

@@ -17,7 +17,7 @@ using System.Text;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.PublicModuleService
 {

+ 2 - 2
DK.Service/PublicModuleService/PublicModuleService.csproj

@@ -83,9 +83,9 @@
     <Compile Include="PublicModuleLogic.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 12 - 12
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
@@ -13404,8 +13404,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-					new Oracle.DataAccess.Client.OracleParameter(":BackupMonth",cre.Properties["BackupMonth"]),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":BackupMonth",cre.Properties["BackupMonth"]),
 				};
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -13444,8 +13444,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 				OracleParameter[] opara = new OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":upname", OracleDbType.NVarchar2,cre.Properties["UPName"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":upname", OracleDbType.NVarchar2,cre.Properties["UPName"], ParameterDirection.Input),
 				};
 
 				DataTable upTable = oracleConn.GetSqlResultToDt(sql, opara);
@@ -13509,12 +13509,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":DateBegin", OracleDbType.Date,cre.Properties["DateBegin"], ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":DateEnd", OracleDbType.Date,cre.Properties["DateEnd"], ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":GoodsTypeCode", OracleDbType.NVarchar2,cre.Properties["GoodsTypeCode"], ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":GoodsCode", OracleDbType.NVarchar2,cre.Properties["GoodsCode"], ParameterDirection.Input),
-					new Oracle.DataAccess.Client.OracleParameter(":logoname", OracleDbType.NVarchar2,cre.Properties["LogoName"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":DateBegin", OracleDbType.Date,cre.Properties["DateBegin"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":DateEnd", OracleDbType.Date,cre.Properties["DateEnd"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":GoodsTypeCode", OracleDbType.NVarchar2,cre.Properties["GoodsTypeCode"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":GoodsCode", OracleDbType.NVarchar2,cre.Properties["GoodsCode"], ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":logoname", OracleDbType.NVarchar2,cre.Properties["LogoName"], ParameterDirection.Input),
 				};
 
 				oracleConn.Open();
@@ -13558,7 +13558,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID", OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
 				};
 
 				oracleConn.Open();

+ 2 - 2
DK.Service/ReportModuleLogic/ReportModuleLogic.csproj

@@ -74,9 +74,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/SAPDataService/SAPDataLogic.cs

@@ -10,7 +10,7 @@ using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.Service.SAPHegiiDataService.HGSAPDK_ZPPFM008;
 using Dongke.IBOSS.PRD.Service.SAPHegiiDataService.HGSAPDK_ZPPFM010;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.SAPHegiiDataService
 {

+ 2 - 2
DK.Service/SAPDataService/SAPHegiiDataService.csproj

@@ -56,9 +56,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=4.112.4.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/SmartDeviceService/PLCModuleLogic.cs

@@ -14,7 +14,7 @@ using System.Net.Sockets;
 using System.Text;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using PCLCommunication;
 
 namespace Dongke.IBOSS.PRD.Service.SmartDeviceService

+ 1 - 1
DK.Service/SmartDeviceService/SmartDeviceLogic.cs

@@ -14,7 +14,7 @@ using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.SmartDeviceService
 {

+ 2 - 2
DK.Service/SmartDeviceService/SmartDeviceService.csproj

@@ -56,9 +56,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=4.112.4.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=AMD64">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 59 - 59
DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 {
@@ -2848,9 +2848,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string sqlString = "update tp_mst_userlogin set locktime=null,islocked=0 where userid=:userid";
-                Oracle.DataAccess.Client.OracleParameter[] paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":userid", OracleDbType.Int32, UserID, ParameterDirection.Input)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":userid", OracleDbType.Int32, UserID, ParameterDirection.Input)
                 };
                 #endregion
                 returnRows = oracleTrConn.ExecuteNonQuery(sqlString, paras);
@@ -2893,10 +2893,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 string sql = "DELETE TP_MST_UserPurview WHERE UserID = :userID"
                            + " AND (PurviewType <>:PurviewType "
                            + " OR (PurviewType =:PurviewType AND PurviewID IN (SELECT OrganizationID FROM TP_MST_Organization WHERE ValueFlag = 1))) ";
-                Oracle.DataAccess.Client.OracleParameter[] paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
-                    new Oracle.DataAccess.Client.OracleParameter(":PurviewType",2),
-                    new Oracle.DataAccess.Client.OracleParameter(":userID",userID)
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",2),
+                    new Oracle.ManagedDataAccess.Client.OracleParameter(":userID",userID)
                 };
                 returnRowCount += oracleTrConn.ExecuteNonQuery(sql, paras);//删除以前所设置的权限
                 // 顺序插入现有的权限数据
@@ -2911,11 +2911,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             if (Convert.ToInt32(dataRow["PurviewID"]) == -1)
                             {
                                 sql = "select 1 from TP_MST_UserPurview where UserID=:UserID and PurviewID=:PurviewID and PurviewType=:PurviewType";
-                                paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                                {
-                                   new Oracle.DataAccess.Client.OracleParameter(":UserID",userID),
-                                   new Oracle.DataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
-                                   new Oracle.DataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
+                                   new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
+                                   new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
+                                   new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
                                };
                                 dsExist = oracleTrConn.GetSqlResultToDs(sql, paras);
                                 if (dsExist != null && dsExist.Tables[0].Rows.Count == 0)
@@ -2930,12 +2930,12 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewID"
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
-                                    paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                                    paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                            {
-                               new Oracle.DataAccess.Client.OracleParameter(":UserID",userID),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
                            };
                                     returnRowCount += oracleTrConn.ExecuteNonQuery(sql, paras);
                                 }
@@ -2954,12 +2954,12 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewID"
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
-                                paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                            {
-                               new Oracle.DataAccess.Client.OracleParameter(":UserID",userID),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
                            };
                                 returnRowCount += oracleTrConn.ExecuteNonQuery(sql, paras);
                             }
@@ -3016,9 +3016,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 oracleTrConn.Connect();
                 #region 删除数据
                 string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                     {
-                        new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
                     };
                 #endregion
                 result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
@@ -3036,11 +3036,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                     }
@@ -3144,9 +3144,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 oracleTrConn.Connect();
                 #region 删除数据
                 string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID";
-                Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                     {
-                        new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
+                        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
                     };
                 #endregion
                 result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
@@ -3164,11 +3164,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                     }
@@ -3190,11 +3190,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                     }
@@ -4566,9 +4566,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 oracleTrConn.Connect();
                 //#region 删除数据
                 //string sqlString1 = "DELETE TP_MST_UserRight WHERE UserID = :pUserID";
-                //Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[] 
+                //Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 //    {
-                //        new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
+                //        new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input)
                 //    };
                 //#endregion
                 //result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString1, paras1);
@@ -4586,21 +4586,21 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, dataRow["UserID"], ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, dataRow["UserID"], ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":pCreateUserID", OracleDbType.Int32, sUserInfo.UserID, ParameterDirection.Input)
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                     }
                     else if (dataRow.RowState == DataRowState.Deleted)
                     {
                         string sqlDelete = "delete from TP_MST_UserRight where UserID=:UserID and FunctionCode=:FunctionCode";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2Delete = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":FunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode",DataRowVersion.Original].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":FunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode",DataRowVersion.Original].ToString(), ParameterDirection.Input),
                             };
                         result.OperationStatus += oracleTrConn.ExecuteNonQuery(sqlDelete, paras2Delete);
                     }
@@ -4662,12 +4662,12 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
 
-                            Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[] 
+                            Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                            {
-                               new Oracle.DataAccess.Client.OracleParameter(":UserID",Convert.ToInt32(dataRow["UserID"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
-                               new Oracle.DataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",Convert.ToInt32(dataRow["UserID"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
+                               new Oracle.ManagedDataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
                            };
                             returnRowCount += oracleTrConn.ExecuteNonQuery(sqlString2, paras2);
                         }
@@ -4676,11 +4676,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     else if (dataRow.RowState == DataRowState.Deleted)
                     {
                         string sqlDelete = "delete from TP_MST_UserPurview where UserID=:UserID and PurviewID=:PurviewID and PurviewType=:PurviewType";
-                        Oracle.DataAccess.Client.OracleParameter[] paras2Delete = new Oracle.DataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                             {
-                                new Oracle.DataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":PurviewID",OracleDbType.Int32, dataRow["PurviewID",DataRowVersion.Original].ToString(), ParameterDirection.Input),
-                                new Oracle.DataAccess.Client.OracleParameter(":PurviewType",OracleDbType.Int32, dataRow["PurviewType",DataRowVersion.Original].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID",OracleDbType.Int32, dataRow["PurviewID",DataRowVersion.Original].ToString(), ParameterDirection.Input),
+                                new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",OracleDbType.Int32, dataRow["PurviewType",DataRowVersion.Original].ToString(), ParameterDirection.Input),
                             };
                         returnRowCount += oracleTrConn.ExecuteNonQuery(sqlDelete, paras2Delete);
                     }
@@ -4703,12 +4703,12 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 //               + " ,:PurviewID"
                 //               + " ,:PurviewType"
                 //               + " ,:CreateUserID) ";
-                //            paras = new Oracle.DataAccess.Client.OracleParameter[] 
+                //            paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 //           {
-                //               new Oracle.DataAccess.Client.OracleParameter(":UserID",userID),
-                //               new Oracle.DataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
-                //               new Oracle.DataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
-                //               new Oracle.DataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
+                //               new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
+                //               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
+                //               new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",Convert.ToInt32(dataRow["PurviewType"])),
+                //               new Oracle.ManagedDataAccess.Client.OracleParameter(":CreateUserID",sUserInfo.UserID),
                 //           };
                 //            returnRowCount += oracleTrConn.ExecuteNonQuery(sql, paras);
                 //        }

+ 132 - 132
DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using System.Collections.Generic;
 
 namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
@@ -402,9 +402,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				}
 				#region 对应要执行的SQL语句
 				string strSql = "Select * From TP_MST_Account Where valueflag = :valueflag ORDER BY ValueFlag DESC,AccountCode";
-				Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",strValueFlag)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",strValueFlag)
 				};
 				#endregion
 				oracleConn.Open();
@@ -1310,15 +1310,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				//根据帐套查询数据
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					sqlString = "Select 0 as Sel, KilnID,KilnCode,KilnName,KilnType,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ "from TP_MST_Kiln where AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				};
 				}
 				//根据帐套,标识查询数据
@@ -1326,10 +1326,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				{
 					sqlString = "Select KilnID,KilnCode,KilnName,KilnType,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ "from TP_MST_Kiln where valueflag = :valueflag and AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				};
 				}
 				oracleConn.Open();
@@ -1364,9 +1364,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				string sqlString = "Select KilnID,KilnCode,KilnName,KilnType,INOUTMINTIMEIINTERVAL,OUTMINTIMEIINTERVAL,TurnoverInterval," +
 					"Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp " +
 					"from TP_MST_Kiln where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1401,16 +1401,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				try
 				{
 					string sqlString = string.Empty;
-					Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 					//根据帐套查询数据
 					if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 					{
 						sqlString = "Select KilnCarID,KilnID,KilnCarCode,KilnCarName,MaxGoodsNum,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									 + "from TP_MST_KilnCar where KilnID = :KilnID and AccountID = :AccountID";
-						oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+						oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 						 {
-							 new Oracle.DataAccess.Client.OracleParameter(":KilnID",kilnID),
-							 new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+							 new Oracle.ManagedDataAccess.Client.OracleParameter(":KilnID",kilnID),
+							 new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 						  };
 					}
 					//根据帐套,标识查询数据
@@ -1418,11 +1418,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					{
 						sqlString = "Select KilnCarID,KilnID,KilnCarCode,KilnCarName,MaxGoodsNum,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									  + "from TP_MST_KilnCar where valueflag = :valueflag and KilnID = :KilnID and AccountID = :AccountID";
-						oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+						oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 							   {
-								  new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-								  new Oracle.DataAccess.Client.OracleParameter(":KilnID",kilnID),
-								  new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+								  new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+								  new Oracle.ManagedDataAccess.Client.OracleParameter(":KilnID",kilnID),
+								  new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 								};
 					}
 					oracleConn.Open();
@@ -1462,9 +1462,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				string sqlString = "Select KilnCarID,KilnID,KilnCarCode,KilnCarName,MaxGoodsNum,KilnCarNum,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 								 + "from TP_MST_KilnCar where AccountID = :AccountID "
 								 + " order by KilnCarNum, KilnCarCode";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1523,9 +1523,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 										 + " tp_sys_goodsleveltype.goodsleveltypeid"
 										 + " where "
 										 + " AccountID = :AccountID";
-					Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
 				};
 					oracleConn.Open();
 					DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1607,16 +1607,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				try
 				{
 					string sqlString = String.Empty;
-					Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 					//根据帐套获得数据字典管理的数据
 					if (Pvalue.ToString() == Constant.INT_IS_ONE.ToString())
 					{
 						sqlString = "Select DictionaryID,DictionaryType,DictionaryValue,DisplayNo,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 								   + "UpdateUserID,OPTimeStamp from TP_MST_DataDictionary where DictionaryType = :DictionaryType and AccountID = :AccountID";
-						oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+						oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 						  {
-							new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-							new Oracle.DataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
+							new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+							new Oracle.ManagedDataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
 						   };
 					}
 					//根据帐套,标识获得数据字典管理的数据
@@ -1624,11 +1624,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					{
 						sqlString = "Select DictionaryID,DictionaryType,DictionaryValue,DisplayNo,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 							  + "UpdateUserID,OPTimeStamp from TP_MST_DataDictionary where valueflag = :valueflag and DictionaryType = :DictionaryType and AccountID = :AccountID";
-						oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+						oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 						   {
-								new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-								new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-								new Oracle.DataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
+								new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+								new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+								new Oracle.ManagedDataAccess.Client.OracleParameter(":DictionaryType",dictionaryType)
 							};
 					}
 					oracleConn.Open();
@@ -1667,9 +1667,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				//获取数据字典管理的全部数据
 				string sqlString = "Select DictionaryID,DictionaryType,DictionaryValue,DisplayNo,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 								   + "UpdateUserID,OPTimeStamp from TP_MST_DataDictionary where AccountID = :AccountID order by DictionaryType,DisplayNo";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1746,9 +1746,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				//获取系统参数管理的数据
 				string sqlString = "Select SettingCode,SettingName,CategoryName,SettingValue,SettingDefaultValues,AccountID,Remarks,Tooltip,EditFlag,UpdateTime,"
 									  + "UpdateUserID,OPTimeStamp from TP_MST_SystemSetting where  AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				};
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1782,10 +1782,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				//获取系统参数管理的数据
 				string sqlString = "Select SettingCode,SettingName,CategoryName,SettingValue,SettingDefaultValues,AccountID,Remarks,Tooltip,EditFlag,UpdateTime,"
 									  + "UpdateUserID,OPTimeStamp from TP_MST_SystemSetting where  AccountID = :AccountID and SettingCode=:SettingCode";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-					new Oracle.DataAccess.Client.OracleParameter(":SettingCode",settingcode)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":SettingCode",settingcode)
 				};
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1896,15 +1896,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					// 0 as Sel, 陈冰添加根据帐套查询数据
 					sqlString = "Select 0 as Sel,JobsID,JobsCode,JobsName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 								  + "from TP_MST_Jobs where AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
-						new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+						new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 					};
 				}
 				else if (pValue.ToString() == Constant.INT_IS_ZERO.ToString())
@@ -1912,10 +1912,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					// 0 as Sel, 陈冰添加根据账套帐标识符查询数据
 					sqlString = "Select 0 as Sel,JobsID,JobsCode,JobsName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ "from TP_MST_Jobs where valueflag = :valueflag and AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				}
 				oracleConn.Open();
@@ -1948,9 +1948,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select JobsID,JobsCode,JobsName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 								  + "from TP_MST_Jobs where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -1982,15 +1982,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					//根据帐套查询数据
 					sqlString = "Select PostID,PostCode,PostName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									 + "from TP_MST_Post where AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 					};
 				}
 				else if (pValue.ToString() == Constant.INT_IS_ZERO.ToString())
@@ -1998,10 +1998,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//根据帐套,标识符查询数据
 					sqlString = "Select PostID,PostCode,PostName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ "from TP_MST_Post where valueflag = :valueflag and AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				}
 				oracleConn.Open();
@@ -2034,9 +2034,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select PostID,PostCode,PostName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									 + "from TP_MST_Post where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2068,15 +2068,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					// 0 as Sel, 陈冰添加根据帐套查询数据
 					sqlString = "Select 0 as Sel,TP_MST_Defect.DefectID,TP_MST_Defect.DefectCode,TP_MST_Defect.DefectName,TP_MST_Defect.Remarks,TP_MST_Defect.AccountID,TP_MST_Defect.ValueFlag,TP_MST_Defect.CreateTime,TP_MST_Defect.CreateUserID,TP_MST_Defect.UpdateTime,TP_MST_Defect.UpdateUserID,TP_MST_Defect.OPTimeStamp,TP_MST_Defect.DEFECTTYPEID,TP_MST_DEFECTTYPE.DEFECTTYPENAME "
 									 + "from TP_MST_Defect left join TP_MST_DEFECTTYPE on TP_MST_Defect.DEFECTTYPEID=TP_MST_DEFECTTYPE.DEFECTTYPEID where TP_MST_Defect.AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				}
 				else if (pValue.ToString() == Constant.INT_IS_ZERO.ToString())
@@ -2084,10 +2084,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//根据帐套,标识符查询数据
 					sqlString = "Select 0 as Sel,TP_MST_Defect.DefectID,TP_MST_Defect.DefectCode,TP_MST_Defect.DefectName,TP_MST_Defect.Remarks,TP_MST_Defect.AccountID,TP_MST_Defect.ValueFlag,TP_MST_Defect.CreateTime,TP_MST_Defect.CreateUserID,TP_MST_Defect.UpdateTime,TP_MST_Defect.UpdateUserID,TP_MST_Defect.OPTimeStamp,TP_MST_Defect.DEFECTTYPEID,TP_MST_DEFECTTYPE.DEFECTTYPENAME "
 									 + "from TP_MST_Defect left join TP_MST_DEFECTTYPE on TP_MST_Defect.DEFECTTYPEID=TP_MST_DEFECTTYPE.DEFECTTYPEID where TP_MST_Defect.valueflag = :valueflag and TP_MST_Defect.AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				  {
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				}
 				oracleConn.Open();
@@ -2120,9 +2120,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select DefectID,DefectCode,DefectName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp,DefectTypeID "
 									+ " ,displayno from TP_MST_Defect where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2155,15 +2155,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					//根据帐套查询数据
 					sqlString = "Select GMouldTypeID,GMouldTypeCode,GMouldTypeName,CanManyTimes,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 									+ "UpdateUserID,OPTimeStamp from TP_MST_GMouldType where AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				  {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				}
 				else if (pValue.ToString() == Constant.INT_IS_ZERO.ToString())
@@ -2171,10 +2171,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//根据帐套,标识符查询数据
 					sqlString = "Select GMouldTypeID,GMouldTypeCode,GMouldTypeName,CanManyTimes,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 									+ "UpdateUserID,OPTimeStamp from TP_MST_GMouldType where valueflag = :valueflag and AccountID = :AccountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				  {
-					new Oracle.DataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				  };
 				}
 				oracleConn.Open();
@@ -2207,9 +2207,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select GMouldTypeID,GMouldTypeCode,GMouldTypeName,CanManyTimes,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,"
 									+ "UpdateUserID,OPTimeStamp from TP_MST_GMouldType where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2340,10 +2340,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 									+ " on TP_SYS_StaffStatus.StaffStatusID = TP_HR_Staff.StaffStatus"
 									+ " WHERE TP_HR_Staff.AccountID = :AccountID"
 									+ " AND TP_HR_Staff.userID = :userID  AND TP_HR_Staff.ValueFlag = 1";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-					new Oracle.DataAccess.Client.OracleParameter(":userID",userID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":userID",userID)
 				};
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2376,13 +2376,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					//根据帐套查询数据
 					sqlString = "Select DefectPositionID,DefectPositionCode,DefectPositionName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,"
 								+ "UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_DefectPosition where AccountID =:accountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					  {
 						new OracleParameter(":accountID",sUserInfo.AccountID)
 					  };
@@ -2392,7 +2392,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//根据帐套,标识符查询数据
 					sqlString = "Select DefectPositionID,DefectPositionCode,DefectPositionName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,"
 								+ "UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_DefectPosition where valueflag = :valueflag and AccountID =:accountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
 						new OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
 						new OracleParameter(":accountID",sUserInfo.AccountID)
@@ -2428,9 +2428,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select DefectPositionID,DefectPositionCode,DefectPositionName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,"
 								+ "UpdateTime,UpdateUserID,OPTimeStamp ,displayno from TP_MST_DefectPosition where AccountID =:accountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -2463,13 +2463,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string sqlString = string.Empty;
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = null;
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = null;
 				if (pValue.ToString() == Constant.INT_IS_ONE.ToString())
 				{
 					//根据帐套查询数据
 					sqlString = "Select GoodsTypeID,GoodsTypeCode,GoodsTypeName,GoodsTypeFullName,IsLeafNode,Remarks,AccountID,ValueFlag,"
 							   + "CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_GoodsType where AccountID =:accountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
 					  new OracleParameter(":accountID",sUserInfo.AccountID)
 					};
@@ -2479,7 +2479,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//根据帐套,标识符查询数据
 					sqlString = "Select GoodsTypeID,GoodsTypeCode,GoodsTypeName,GoodsTypeFullName,IsLeafNode,Remarks,AccountID,ValueFlag,"
 								+ "CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp from TP_MST_GoodsType where valueflag = :valueflag and AccountID =:accountID";
-					oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
 					   new OracleParameter(":valueflag",Constant.INT_IS_ONE.ToString()),
 					   new OracleParameter(":accountID",sUserInfo.AccountID)
@@ -2560,7 +2560,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 									   + " and AccountID =:accountID "
 									   + " and goodstypecode like :typeCode"
 									   + " order by goodstypecode ";
-					Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[]
+					Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
 					new OracleParameter(":valueflag",strValueFlag),
 					new OracleParameter(":typeCode",typeCode+"%"),
@@ -2601,7 +2601,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			try
 			{
 				string strSql = "Select * from TP_MST_Goods where GoodsTypeID = :GoodsTypeID and AccountID =:accountID";
-				Oracle.DataAccess.Client.OracleParameter[] paras1 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras1 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
 					new OracleParameter(":accountID",sUserInfo.AccountID),
 					new OracleParameter(":GoodsTypeID",GoodsTypeID)
@@ -2701,16 +2701,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				string strSqlCancelProcedure = "select a.Procedureid as PurviewID,a.ProcedureCode,a.Procedurename,case (nvl(b.purviewid,0)) when 0 then 0 else 1 end as RightFlag, 13 as PurviewType,a.ValueFlag,a.ProductionLineid from ("
 								+ " select Procedureid,ProcedureCode,Procedurename,ProductionLineid,valueflag from tp_pc_procedure where tp_pc_procedure.AccountID = :AccountID and UnDoFlag=1 Order by displayno) a "
 								+ " left join (SELECT * FROM TP_MST_UserPurview WHERE UserID =:UserID AND PurviewType = 13) b on a.Procedureid=b.purviewid ";
-				Oracle.DataAccess.Client.OracleParameter[] paras = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
-					new Oracle.DataAccess.Client.OracleParameter(":UserID",userID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID)
 				};
 				string sqlFunctionCode = "SELECT * FROM TP_MST_UserPurview WHERE UserID =:UserID and purviewid=-1";
 
-				Oracle.DataAccess.Client.OracleParameter[] parasFunctionCode = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] parasFunctionCode = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":UserID",userID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID)
 				};
 
 				oracleConn.Open();
@@ -2802,16 +2802,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				"   AND f.functionprogram = '1'" +
 				" WHERE userid = :pUserid";
 
-				Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":pUserid", OracleDbType.Int32,userID, ParameterDirection.Input)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserid", OracleDbType.Int32,userID, ParameterDirection.Input)
 				};
 				DataTable dtUserRight = oracleConn.GetSqlResultToDt(strSql2, paras2);
 				//string strSql3 = "SELECT C.FunctionCode, COUNT(C.UserID) AS UseNum FROM TP_MST_UserRight C,TP_MST_User D"
 				//    + " WHERE C.UserID = D.UserID AND D.ValueFlag > 0 AND D.AccountID = :accountID  GROUP BY C.FunctionCode";
-				//Oracle.DataAccess.Client.OracleParameter[] paras3 = new Oracle.DataAccess.Client.OracleParameter[] 
+				//Oracle.ManagedDataAccess.Client.OracleParameter[] paras3 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
 				//{
-				//    new Oracle.DataAccess.Client.OracleParameter(":accountID", OracleDbType.Int32,sUserInfo.AccountID, ParameterDirection.Input)
+				//    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountID", OracleDbType.Int32,sUserInfo.AccountID, ParameterDirection.Input)
 				//};
 				//DataTable dtUserFuncNum = oracleConn.GetSqlResultToDt(strSql3, paras3);
 				#endregion
@@ -2833,9 +2833,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//}
 				}
 				string sqlExist = "select 1 from TP_MST_UserRight where Functioncode='[ALL]' and UserID=:UserID";
-				Oracle.DataAccess.Client.OracleParameter[] paras4 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras4 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32,userID, ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32,userID, ParameterDirection.Input),
 				};
 				DataSet dsExist = oracleConn.GetSqlResultToDs(sqlExist, paras4);
 				if (dsExist != null && dsExist.Tables[0].Rows.Count > 0)
@@ -2887,16 +2887,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				"   AND f.valueflag = '1'\n" +
 				"   AND f.functionprogram = '2'" +
 				" WHERE userid = :pUserid";
-				Oracle.DataAccess.Client.OracleParameter[] paras2 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":pUserid", OracleDbType.Int32,userID, ParameterDirection.Input)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserid", OracleDbType.Int32,userID, ParameterDirection.Input)
 				};
 				DataTable dtUserRight = oracleConn.GetSqlResultToDt(strSql2, paras2);
 				//string strSql3 = "SELECT C.FunctionCode, COUNT(C.UserID) AS UseNum FROM TP_MST_UserRight C,TP_MST_User D"
 				//    + " WHERE C.UserID = D.UserID AND D.ValueFlag > 0 AND D.AccountID = :accountID  GROUP BY C.FunctionCode";
-				//Oracle.DataAccess.Client.OracleParameter[] paras3 = new Oracle.DataAccess.Client.OracleParameter[] 
+				//Oracle.ManagedDataAccess.Client.OracleParameter[] paras3 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
 				//{
-				//    new Oracle.DataAccess.Client.OracleParameter(":accountID", OracleDbType.Int32,sUserInfo.AccountID, ParameterDirection.Input)
+				//    new Oracle.ManagedDataAccess.Client.OracleParameter(":accountID", OracleDbType.Int32,sUserInfo.AccountID, ParameterDirection.Input)
 				//};
 				//DataTable dtUserFuncNum = oracleConn.GetSqlResultToDt(strSql3, paras3);
 				#endregion
@@ -2918,9 +2918,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//}
 				}
 				string sqlExist = "select 1 from TP_MST_UserRight where Functioncode='[ALL2]' and UserID=:UserID";
-				Oracle.DataAccess.Client.OracleParameter[] paras4 = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras4 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32,userID, ParameterDirection.Input),
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32,userID, ParameterDirection.Input),
 				};
 				DataSet dsExist = oracleConn.GetSqlResultToDs(sqlExist, paras4);
 				if (dsExist != null && dsExist.Tables[0].Rows.Count > 0)
@@ -2962,9 +2962,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 							 + " AND C.AccountID = " + sUserInfo.AccountID
 					 + " WHERE B.ValueFlag > 0 AND A.FunctionCode = :pFunctionCode"
 					 + " ORDER BY C.AccountName,B.UserCode,B.UserName";
-				Oracle.DataAccess.Client.OracleParameter[] paras = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				{
-					new Oracle.DataAccess.Client.OracleParameter(":pFunctionCode", OracleDbType.Varchar2, functionCode, ParameterDirection.Input)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode", OracleDbType.Varchar2, functionCode, ParameterDirection.Input)
 				};
 				#endregion
 				DataSet dsResult = oracleConn.GetSqlResultToDs(sqlString, paras);
@@ -3294,9 +3294,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select 0 as Sel, LogoID,LogoCode,LogoName,Remarks,ValueFlag,0 as AddFlag,isdefault,concat(LogoName||'[',LogoCode||']') as LogoNameCode,displayno, TagCode "
 								  + "from tp_mst_logo where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3328,9 +3328,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select LogoID,LogoCode,LogoName,isdefault,concat(LogoName||'[',LogoCode||']') as LogoNameCode "
 								  + "from tp_mst_logo where AccountID = :AccountID and valueflag ='1' order by isdefault desc, displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3364,9 +3364,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select DefectTypeID,DefectTypeName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ " ,displayno from TP_MST_DefectType where AccountID = :AccountID";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3399,9 +3399,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select DefectFineID,DefectFineCode,Remarks,DisplayNo,ValueFlag,0 as sel "
 								  + "from TP_MST_DefectFine where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3433,9 +3433,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				string sqlString = "Select *"
 								  + "from TP_MST_DefectDeduction where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3529,9 +3529,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				string sqlString = "Select DefectID,DefectCode,DefectName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,"
 								+ " UpdateTime,UpdateUserID,OPTimeStamp,displayno, concat(tp_mst_semicheckdefect.DefectCode||'->',tp_mst_semicheckdefect.DefectName) as DefectFlagName from tp_mst_semicheckdefect where AccountID =:accountID"
 								+ " order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3564,9 +3564,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				string sqlString = "Select DefectPositionID,DefectPositionCode,DefectPositionName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,"
 								+ " UpdateTime,UpdateUserID,OPTimeStamp,displayno, concat(tp_mst_scdefectposition.DefectPositionCode||'->',tp_mst_scdefectposition.DefectPositionName) as DefectPositionFlagName from tp_mst_scdefectposition where AccountID =:accountID"
 								+ " order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -3634,9 +3634,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				//获取窑炉管理数据
 				string sqlString = "Select ID,Name,TypeFlag,TechnologyFlag,DisplayNo,Remarks,ValueFlag " +
 					"from TP_MST_TecDep where AccountID = :AccountID order by DisplayNo";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -4834,9 +4834,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PrinterID,PrinterName,Remarks,displayno "
 								 + " from TP_MST_BarCodePrinter where AccountID = :AccountID and valueflag = '1' order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -4868,9 +4868,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PrinterID,PrinterName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ " ,displayno from TP_MST_BarCodePrinter where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -5056,9 +5056,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PLCID,PLCName,IP, PORT, PLCDescription, Remarks,displayno "
                                  + " from TP_MST_PLC where AccountID = :AccountID and valueflag = '1' order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -5090,9 +5090,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PLCID,PLCName,IP, PORT, PLCDescription,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
                                     + " ,displayno from TP_MST_PLC where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -5292,9 +5292,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select SupplierID,SupplierName,Remarks,displayno "
 								 + " from TP_MST_MouldMaterialSuppliers where AccountID = :AccountID and valueflag = '1' order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -5326,9 +5326,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select SupplierID,SupplierName,Remarks,displayno,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
 									+ " from TP_MST_MouldMaterialSuppliers where AccountID = :AccountID order by displayno";
-				Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
-					new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+					new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 				   };
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
@@ -6390,9 +6390,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 								+ " WHERE AccountID = :AccountID Order By DisplayNo";
 					oracleConn.Open();
 
-					Oracle.DataAccess.Client.OracleParameter[] oracleParameter = new Oracle.DataAccess.Client.OracleParameter[]
+					Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 					{
-						new Oracle.DataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
+						new Oracle.ManagedDataAccess.Client.OracleParameter(":AccountID",sUserInfo.AccountID)
 					};
 					DataTable returnTable = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
 					returnTable.TableName = "TP_MST_ScrapReason";

+ 2 - 2
DK.Service/SystemModuleLogic/SystemModuleLogic.csproj

@@ -80,9 +80,9 @@
     <Compile Include="SystemModuleLogicPartial.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

+ 1 - 1
DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -16,7 +16,7 @@ using System.Text;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 {

+ 1 - 1
DK.Service/TATModuleLogic/TATModuleLogic.cs

@@ -16,7 +16,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.TATModuleLogic
 {

+ 2 - 2
DK.Service/TATModuleLogic/TATModuleLogic.csproj

@@ -75,9 +75,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=10.2.0.100, Culture=neutral, PublicKeyToken=89b483f429c47342">
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\IBOSS.PRD.Service\orcl_10_11_x32\Oracle.DataAccess.dll</HintPath>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

+ 1 - 1
DK.Service/TATModuleLogic/TATModuleLogicDAL.cs

@@ -16,7 +16,7 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.TATModuleLogic
 {

+ 1 - 1
DK.Service/TATModuleLogic/TATModuleLogicDALPartial.cs

@@ -19,7 +19,7 @@ using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.Service.CommonModuleLogic;
 
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 using System.Text;
 
 namespace Dongke.IBOSS.PRD.Service.TATModuleLogic

+ 1 - 1
DK.Service/TATModuleLogic/TATModuleLogicPartial.cs

@@ -17,7 +17,7 @@ using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
 
 namespace Dongke.IBOSS.PRD.Service.TATModuleLogic
 {

BIN
DLL/Oracle.ManagedDataAccess.dll


+ 9 - 8
IBOSS.PRD.sln

@@ -103,6 +103,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLL", "DLL", "{7B766D59-13A
 	ProjectSection(SolutionItems) = preProject
 		DLL\Curtain.Framework.dll = DLL\Curtain.Framework.dll
 		DLL\Curtain.Net.Sockets.dll = DLL\Curtain.Net.Sockets.dll
+		DLL\Oracle.ManagedDataAccess.dll = DLL\Oracle.ManagedDataAccess.dll
 		DLL\Utilities.dll = DLL\Utilities.dll
 		DLL\zxing.dll = DLL\zxing.dll
 	EndProjectSection
@@ -928,32 +929,32 @@ Global
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x64.Build.0 = Debug|Any CPU
-		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x86.Build.0 = Debug|Any CPU
+		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x86.ActiveCfg = Debug|x86
+		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Debug|x86.Build.0 = Debug|x86
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x64.Build.0 = Release|Any CPU
-		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x86.Build.0 = Release|Any CPU
+		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x86.ActiveCfg = Release|x86
+		{812E21A4-4925-4129-AF25-FD15B1BDA1AA}.Release|x86.Build.0 = Release|x86
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x86.ActiveCfg = Debug|x86
+		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Debug|x86.Build.0 = Debug|x86
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x64.ActiveCfg = Release|Any CPU
 		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x64.Build.0 = Release|Any CPU
-		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x86.ActiveCfg = Release|Any CPU
-		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x86.Build.0 = Release|Any CPU
+		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x86.ActiveCfg = Release|x86
+		{3ADEFD6C-64B4-41B3-A157-84A99CCA9A5C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 4 - 0
WCF.Service/WCF.Hosting/WCF.Hosting.csproj

@@ -124,6 +124,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />