优化接口

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -2710,6 +2710,14 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IMaterialsRepositories.GetEntityList(System.IServiceProvider,System.Nullable{System.Int32})">
+            <summary>
+            
+            </summary>
+            <param name="serPro"></param>
+            <param name="orgId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IMaterialsRepositories.GetEntityList(System.Nullable{System.Int32})">
             <summary>
             列表

src/WMS.Web.Domain/Infrastructure/IMaterialsRepositories.cs

@@ -19,6 +19,14 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<bool> AddRange(List<Materials> entitys, bool isTransaction = true);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="serPro"></param>
+        /// <param name="orgId"></param>
+        /// <returns></returns>
+        Task<List<Materials>> GetEntityList(IServiceProvider serPro, int? orgId = null);
+
         /// <summary>
         /// 列表
         /// </summary>

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -912,8 +912,8 @@ namespace WMS.Web.Domain.Services.Public
             //1.审核状态：已审核
             //2.禁用状态：A否，B是
             //3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
-            //param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and (FUseOrgId=19162897 or FUseOrgId=100008)";
+            param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and (FUseOrgId=19162897 or FUseOrgId=100008)";
-            param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
+            //param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
             param.OrderString = "FCreateDate ASC";
 
             //4.循环拿金蝶数据

src/WMS.Web.Repositories/MaterialsRepositories.cs

@@ -62,6 +62,26 @@ namespace WMS.Web.Repositories
             }
         }
 
+        /// <summary>
+        /// 获取集合
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<List<Materials>> GetEntityList(IServiceProvider serPro,int? orgId = null )
+        {
+            using (var context = serPro.GetRequiredService<RepositoryDbContext>())
+            {
+                var query = context.Materials.Where(x => 1 == 1);
+                if (orgId.HasValue)
+                    query = query.Where(x => x.OrgId == orgId.Value);
+
+                var res = await query.ToListAsync();
+
+                return res.Clone();
+            }
+
+        }
+
         /// <summary>
         /// 获取集合
         /// </summary>
@@ -69,6 +89,7 @@ namespace WMS.Web.Repositories
         /// <returns></returns>
         public async Task<List<Materials>> GetEntityList(int? orgId = null)
         {
+
             var query = _context.Materials.Where(x => 1 == 1);
             if (orgId.HasValue)
                 query = query.Where(x => x.OrgId == orgId.Value);
@@ -100,7 +121,7 @@ namespace WMS.Web.Repositories
 
             query = query.Where(x => x.MaterialId == mid);
 
-            var res =  query.FirstOrDefault();
+            var res = query.FirstOrDefault();
 
             return res.Clone();
         }
@@ -110,9 +131,9 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public async Task<Materials> Get(string  code,int orgId)
+        public async Task<Materials> Get(string code, int orgId)
         {
-            var query = _context.Materials.Where(x => x.MaterialNumber==code && x.OrgId==orgId);
+            var query = _context.Materials.Where(x => x.MaterialNumber == code && x.OrgId == orgId);
 
             var res = await query.FirstOrDefaultAsync();