表调整

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -389,8 +389,8 @@ namespace Business.ResourceExamineManagement
             //tagMaster.IsChanged= true;
             //tagMaster.InvTitle = "线边库存核查";
             //await _tagMasterRepository.Insert(tagMaster);
-            //var test= _tagMasterRepository.Select(a => a.CreateUser == "admin");
-            //return JsonConvert.SerializeObject(test.Result);
+            //var test= _tagMasterRepository.SelectDataBaseBySql("Select * from TagMaster Where Nbr='202305050029'", "TagMaster");
+            //return JsonConvert.SerializeObject(test);
             //资源检查入参全局变量赋值
             param.sorderId = input.sorderId;
             param.tenantId = input.tenantId;

MicroServices/Business/Business.EntityFrameworkCore/Business.EntityFrameworkCore.csproj

@@ -15,6 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.2" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.2" />

MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/ISqlRepository.cs

@@ -25,5 +25,7 @@ namespace Bussiness.EntityFrameworkCore.SqlRepositories
         Task<List<T>> Select(Expression<Func<T, bool>> whereLambda);
 
         Task<Tuple<List<T>, int>> Select<S>(int pageSize, int pageIndex, Expression<Func<T, bool>> whereLambda, Expression<Func<T, S>> orderByLambda, bool isAsc);
+
+        DataSet SelectDataBaseBySql(string sql, string tableName);
     }
 }

MicroServices/Business/Business.EntityFrameworkCore/Repository/SqlRepositories/SqlRepository.cs

@@ -12,6 +12,7 @@ using System.Collections;
 using Business.EntityFrameworkCore;
 using System.Linq.Expressions;
 using Z.EntityFramework.Plus;
+using System.Data.SqlClient;
 
 namespace Bussiness.EntityFrameworkCore.SqlRepositories
 {
@@ -85,5 +86,20 @@ namespace Bussiness.EntityFrameworkCore.SqlRepositories
                 return new Tuple<List<T>, int>(entities, total);
             }
         }
+
+        public DataSet SelectDataBaseBySql(string sql, string tableName)
+        {
+            DataSet ds = new DataSet();
+            try
+            {
+                string connectionString = _dbContextProvider.GetDbContextAsync().Result.Database.GetDbConnection().ConnectionString;
+                SqlDataAdapter da = new SqlDataAdapter(sql, connectionString);
+                da.Fill(ds, tableName);
+            }
+            catch (Exception ex)
+            {
+            }
+            return ds;
+        }
     }
 }

MicroServices/Business/Business.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "App": {
-    "CorsOrigins": "https://*.abc.com,http://localhost:9527"
+    "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://123.60.180.165:8020,http://123.60.180.165:8022,http://123.60.180.165:8024"
   },
   "ConnectionStrings": {
     //"Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=true",