|
|
@@ -53,9 +53,9 @@ namespace WCS.Service.Works.SRM
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (obj.Data2.Mode_1 != SCMode.远程) return;
|
|
|
+ if (obj.Data2.SRMMode != SCMode.远程) return;
|
|
|
|
|
|
- if (obj.Data2.Status_1 != SCRunStatus.空闲) return;
|
|
|
+ if (obj.Data2.SRMStatus != SCRunStatus.空闲) return;
|
|
|
|
|
|
var isTransfer = new List<WCS_TASK>();
|
|
|
WCS_TASK enterPriority = new WCS_TASK(), outPriority = new WCS_TASK();
|
|
|
@@ -296,6 +296,9 @@ 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 outDepot = waitTask.Where(v =>
|
|
|
{
|
|
|
var max = v.ADDRTO == "G1340" ? 4 : 10;
|