diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 16ecc535..24252f9f 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2710,6 +2710,14 @@
+
+
+
+
+
+
+
+
列表
diff --git a/src/WMS.Web.Domain/Infrastructure/IMaterialsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IMaterialsRepositories.cs
index d23124f2..7463b5fc 100644
--- a/src/WMS.Web.Domain/Infrastructure/IMaterialsRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IMaterialsRepositories.cs
@@ -19,6 +19,14 @@ namespace WMS.Web.Domain.Infrastructure
///
Task AddRange(List entitys, bool isTransaction = true);
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ Task> GetEntityList(IServiceProvider serPro, int? orgId = null);
+
///
/// 列表
///
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 5a71f281..91bcfbc1 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/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=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.OrderString = "FCreateDate ASC";
//4.循环拿金蝶数据
diff --git a/src/WMS.Web.Repositories/MaterialsRepositories.cs b/src/WMS.Web.Repositories/MaterialsRepositories.cs
index e0567ea0..aa9e1c7c 100644
--- a/src/WMS.Web.Repositories/MaterialsRepositories.cs
+++ b/src/WMS.Web.Repositories/MaterialsRepositories.cs
@@ -62,6 +62,26 @@ namespace WMS.Web.Repositories
}
}
+ ///
+ /// 获取集合
+ ///
+ ///
+ ///
+ public async Task> GetEntityList(IServiceProvider serPro,int? orgId = null )
+ {
+ using (var context = serPro.GetRequiredService())
+ {
+ 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();
+ }
+
+ }
+
///
/// 获取集合
///
@@ -69,6 +89,7 @@ namespace WMS.Web.Repositories
///
public async Task> 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
///
///
///
- public async Task Get(string code,int orgId)
+ public async Task 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();