|
@@ -308,12 +308,10 @@ namespace WCS.Service.Works.SRM
|
|
|
.Where(v => !db.Default.Set<WCS_TASK>().Any(d => d.DEVICE == srm && d.STATUS == TaskStatus.堆垛机执行)).ToList();
|
|
|
//同一个目标地址同时只能有两组正在执行的任务
|
|
|
//同时对结果进行排序,分组后取第一组任务
|
|
|
- //var aa = db.Default.Set<WCS_SRM520>().FromSqlRaw("USE yongguanwms_opp SELECT * FROM sys_config where code = 'SaleTaskGroupCount'");
|
|
|
- //var cc=db.Default.Database.SqlQuery<>
|
|
|
- //var bb = db.Default.Database.SqlQuery.FromSqlRaw("USE yongguanwms_opp SELECT * FROM sys_config where code = 'SaleTaskGroupCount'")
|
|
|
+ var maxnum = ProtocolProxy.YG150Redis.Get("SaleTaskGroupCount").ToInt();
|
|
|
var outDepot = waitTask.Where(v =>
|
|
|
{
|
|
|
- var max = v.ADDRTO == "G1340" ? 4 : 10;
|
|
|
+ var max = v.ADDRTO == "G1340" ? 4 : maxnum;
|
|
|
return db.Default.Set<WCS_TASK>()
|
|
|
.AsNoTracking()
|
|
|
.Where(d => d.TYPE == TaskType.出库)
|