From fd9ce381b904a22593de2ab242fb8f65cee45efa Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 22 五月 2025 15:27:48 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 5554355..9ba5182 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -55,12 +55,12 @@
/// <returns></returns>
public Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- return Db.Queryable<SysMaterials>()
+ var DA = Db.Queryable<SysMaterials>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
- .LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
- .LeftJoin<SysMaterialCategory>((a,b,c,d,e)=>a.CategoryNo == e.CategoryNo)
- .Where((a,b,c,d,e) => d.IsDel == "0" && e.IsDel =="0")
+ //.LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
+ .LeftJoin<SysMaterialCategory>((a,b,c,d)=>a.CategoryNo == d.CategoryNo)
+ .Where((a,b,c,d) => a.IsDel == "0" && d.IsDel == "0" )
.WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
.WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
.WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
@@ -69,9 +69,9 @@
.WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
.WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
.WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
- .Where(a => a.IsDel == "0" )
- .Select<MaterialsDto>((a, b, c,d,e) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
+ .Select<MaterialsDto>((a, b, c,d) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
.ToListAsync();
+ return DA;
}
/// <summary>
--
Gitblit v1.8.0