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

1

Browse Source
This commit is contained in:
alex
2023-07-17 13:36:20 +08:00
parent f2a3da3634
commit b8b040981b
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WarehouseMgr/Tnb.WarehouseMgr/Dp.cs
View File

@@ -18,9 +18,6 @@ namespace Tnb.WarehouseMgr
public class Dp
{
private HashSet<string> set = new HashSet<string>();
private const int Max = int.MaxValue;
private int Min = int.MaxValue;
private int Deep = 0;
/// <summary>
/// 动态规划函数

10
WarehouseMgr/Tnb.WarehouseMgr/WmsFeedingService.cs
View File

@@ -42,7 +42,6 @@ namespace Tnb.WarehouseMgr
dicMaterial = await _db.Queryable<BasMaterial>().ToDictionaryAsync(x => x.id, x => x.name);
}
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
List<CarryCodeDetailOutput> items = new();
List<string> carryMIds = new();
if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
{
@@ -50,11 +49,10 @@ namespace Tnb.WarehouseMgr
carryMIds = carryDs.Select(x => x.membercarry_id).ToList();
}
Expression<Func<WmsCarryCode, bool>> whereExp = carryMIds?.Count > 0 ? a => carryMIds.Contains(a.carry_id) : a => a.carry_id == carryId;
items = await _db.Queryable<WmsCarryCode>().Where(whereExp)
.Select<CarryCodeDetailOutput>()
.Mapper(it => it.material_name = (it.material_id != null && dicMaterial.ContainsKey(it.material_id)) ? dicMaterial[it.material_id].ToString() : "")
.ToListAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(whereExp)
.Select<CarryCodeDetailOutput>()
.Mapper(it => it.material_name = (it.material_id != null && dicMaterial.ContainsKey(it.material_id)) ? dicMaterial[it.material_id].ToString() : "")
.ToListAsync();
return items ?? Enumerable.Empty<dynamic>();
}