wankeda
2025-05-26 0864509e1eb593c3dedb66196ec19fe51437922b
´úÂë¹ÜÀí/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -55,7 +55,6 @@
        }
        public Task Execute(IJobExecutionContext context)
        {
            try
            {
@@ -81,7 +80,7 @@
                };
                // å¤„理实盘入库请求
                ProcessRequests(conveyorLine, requests, "下线请求入库");
                //ProcessRequests(conveyorLine, requests, "下线请求入库");
                // å¤„理空盘回流请求
                ProcessKpRequests(conveyorLine, requestsKP);
@@ -162,18 +161,22 @@
                Dt_Task task = null;
                if (isUpRequest)
                {
                    task = CreateTask(fromAdd, "WaitBind", "正极物流线002的上料请求", "空托盘", taskType);
                    List<Dt_Task> dt_Task = _taskRepository.QueryData(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InPending);
                    if (dt_Task.Count < 0) { continue; }
                    var tasks = dt_Task.Where(x => x.SourceAddress == fromAdd).OrderBy(t => t.CreateDate).First();
                    tasks.TaskState = (int)TaskInStatusEnum.InNew;
                    _taskService.UpdateData(tasks);
                }
                else if (isGMRequest && isGMState == 1)
                {
                    task = CreateTask(fromAdd, "WaitBind", "正极物流线002的上料请求", "隔膜空托盘", taskType);
                }
                //else if (isGMRequest && isGMState == 1)
                //{
                //    task = CreateTask(fromAdd, "WaitBind", "正极物流线002的上料请求", "隔膜空托盘", taskType);
                //}
                // æ·»åŠ ä»»åŠ¡åˆ°ä»»åŠ¡è¡¨
                if (task != null)
                {
                    _taskRepository.AddData(task);
                }
                //// æ·»åŠ ä»»åŠ¡åˆ°ä»»åŠ¡è¡¨
                //if (task != null)
                //{
                //    _taskRepository.AddData(task);
                //}
            }
        }