wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
陈文凯
2024-11-12 16:23:34 +08:00
parent 4559800d63 0681fab46d
commit 69d700d23c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
View File

@@ -69,7 +69,7 @@ namespace Tnb.WarehouseMgr
.WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f) => f.material_standard.Contains(container_no))
.WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
.WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
.Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
.Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString() || c.is_type == ((int)EnumLocationType.人工管理库位).ToString())
.Select((a, b, c, d, e, f, g, h, i) => new WmsStockReportH
{
org_id = e.org_id,
@@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr
.WhereIF(!string.IsNullOrEmpty(container_no), (a, b, c, d, e, f, g, h) => f.material_standard.Contains(container_no))
.WhereIF(!string.IsNullOrEmpty(material_code), (a, b, c, d, e, f) => f.code.Contains(material_code))
.WhereIF(!string.IsNullOrEmpty(warehouse_id), (a, b, c, d, e, f) => c.wh_id == warehouse_id)
.Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
.Where((a, b, c, d, e, f) => c.is_type == ((int)EnumLocationType.存储库位).ToString() || c.is_type == ((int)EnumLocationType.人工管理库位).ToString())
.Select((a, b, c, d, e, f, g, h, i) => new WmsStockReportH
{
org_id = e.org_id,