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

bug

Browse Source
This commit is contained in:
qianjiawei
2024-02-05 10:33:52 +08:00
parent 77816a9989
commit 130e696699
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -71,8 +71,13 @@ namespace Tnb.WarehouseMgr
carryOutPut.carryMats = await _db.Queryable<WmsCarryMat>().Where(it => it.carry_id == carryId).ToListAsync(); carryOutPut.carryMats = await _db.Queryable<WmsCarryMat>().Where(it => it.carry_id == carryId).ToListAsync();
return carryOutPut; return carryOutPut;
} }
[HttpGet]
public async Task<dynamic> GetCarryInfoByCode([FromRoute] string carrycode)
{
var carryOutPut = await _db.Queryable<WmsCarryH>().Where(it => it.carry_code == carrycode).FirstAsync();
return carryOutPut;
}
/// <summary> /// <summary>
/// 更换载具 /// 更换载具
/// </summary> /// </summary>

16
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
View File

@@ -88,16 +88,22 @@ namespace Tnb.WarehouseMgr
if (sPoint != null && ePoint != null) if (sPoint != null && ePoint != null)
{ {
List<WmsPointH> points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); List<WmsPointH> points = new List<WmsPointH>();
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） if (sPoint.area_code != ePoint.area_code)
if (points?.Count > 0)
{ {
points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
if (points.Count <= 2) if (points.Count <= 2)
{ {
throw new AppFriendlyException("该路径不存在", 500); throw new AppFriendlyException("该路径不存在", 500);
} }
}
else
{
points.Add(sPoint);
points.Add(ePoint);
}
List<WmsPretaskH> preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => List<WmsPretaskH> preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
{ {
WmsPointH? sPoint = it.FirstOrDefault(); WmsPointH? sPoint = it.FirstOrDefault();
WmsPointH? ePoint = it.LastOrDefault(); WmsPointH? ePoint = it.LastOrDefault();
@@ -167,8 +173,6 @@ namespace Tnb.WarehouseMgr
//((int)EnumCarryStatus.寄存).ToString() //((int)EnumCarryStatus.寄存).ToString()
} }
} }
}
await _db.Ado.CommitTranAsync(); await _db.Ado.CommitTranAsync();
} }
catch (Exception) catch (Exception)

2
apihost/Tnb.API.Entry/Startup.cs
View File

@@ -63,7 +63,7 @@ public class Startup : AppStartup
services.AddSingleton<BackgroundService, TimedTaskBackgroundService>(sp => new TimedTaskBackgroundService()); services.AddSingleton<BackgroundService, TimedTaskBackgroundService>(sp => new TimedTaskBackgroundService());
//var bgSvc = App.GetRequiredService<BackgroundService>(); //var bgSvc = App.GetRequiredService<BackgroundService>();
//bgSvc.StartAsync(CancellationToken.None); //bgSvc.StartAsync(CancellationToken.None);
services.AddHostedService<RedisBackGround>(); // services.AddHostedService<RedisBackGround>();
} }