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:
qianjiawei
2023-11-16 17:15:05 +08:00
parent 5f957eff80 4e01fd4176
commit 5fe7cd1589
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
View File

@@ -110,15 +110,18 @@ namespace Tnb.WarehouseMgr
{ {
areaIds = input.data[nameof(WmsCheckstockH.area_id)].ToObject<string[]>(); areaIds = input.data[nameof(WmsCheckstockH.area_id)].ToObject<string[]>();
} }
Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false; Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
var filerExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>()
.And((a, b, c) => a.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString())
.And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())
.And((a, b, c) => c.is_lock == 0);
switch (checkType?.ToEnum<EnumCheckType>()) switch (checkType?.ToEnum<EnumCheckType>())
{ {
case EnumCheckType.全库盘点: case EnumCheckType.全库盘点:
{ {
filterExp = (a, b, c) => a.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() filterExp = filerExpable.ToExpression();
&& a.is_type == ((int)EnumLocationType.存储库位).ToString()
&& c.is_lock == 0;
} }
break; break;
case EnumCheckType.物料盘点: case EnumCheckType.物料盘点:
@@ -341,8 +344,6 @@ namespace Tnb.WarehouseMgr
} }
Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false; Expression<Func<BasLocation, WmsCarryCode, WmsCarryH, bool>> filterExp = (a, b, c) => false;
var filerExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>() var filerExpable = Expressionable.Create<BasLocation, WmsCarryCode, WmsCarryH>()
.And((a, b, c) => a.wh_id == input.warehouse_id) .And((a, b, c) => a.wh_id == input.warehouse_id)
.And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString()) .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString())