diff --git a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs index 61588ff9..9e23a680 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs @@ -83,7 +83,7 @@ namespace Tnb.WarehouseMgr { var eles = await _db.Queryable().LeftJoin((a, b) => a.id == b.bill_id) .LeftJoin((a, b, c) => b.location_id == c.endlocation_id) - .Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == $"{input.taskChainCode}-{input.taskCode}") + .Where((a, b, c) => c.endlocation_code == input.targetName && c.bill_code == input.taskCode) .ToListAsync(); } catch (Exception) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs index 28853ff5..ab6a1016 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs @@ -36,8 +36,6 @@ namespace Tnb.WarehouseMgr int row = 0; try { - //例1 获取所有表 - List> dics = await ImportExcelToMemory(file); List locs = new List(); BasLocation loc = new BasLocation(); @@ -55,16 +53,16 @@ namespace Tnb.WarehouseMgr } } locs.ForEach(x => - { - x.id = SnowflakeIdHelper.NextId(); - x.org_id = _userManager.User.OrganizeId; - x.is_lock = 0; - x.create_id = _userManager.UserId; - x.create_time = DateTime.Now; - x.modify_id = null; - x.modify_time = null; - x.is_mix = 1; - }); + { + x.id = SnowflakeIdHelper.NextId(); + x.org_id = _userManager.User.OrganizeId; + x.is_lock = 0; + x.create_id = _userManager.UserId; + x.create_time = DateTime.Now; + x.modify_id = null; + x.modify_time = null; + x.is_mix = 1; + }); await _db.Ado.BeginTranAsync(); row = await _db.Insertable(locs).ExecuteCommandAsync();