1

huangxiaoqiang

8 天以前 644cbe3e4eba765affa25454d69fee6286bb6094

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -387,7 +387,7 @@
        /// <returns></returns>
        public Dt_Task QueryRequestTSJSignalTask()
        {
            return BaseDal.QueryFirst(x => TaskAcrossFloorboundTypes.Contains(x.TaskType) && x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
            return BaseDal.QueryFirst(x =>  x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
        }

        #endregion
@@ -483,6 +483,12 @@
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
                    {
                        content = StackCraneTaskCompleted(task.TaskNum);
                        return content;
                    }
                    if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
                    {
                        var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
                        SendAgvTask(station.stationRemark, task.TaskNum);
                    }

                }
@@ -518,7 +524,7 @@
                        //// ååºåˆ—化响应内容
                        //content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

                        //LogFactory.WriteError($"Info_获取货位", $"获取货位,任务号:【{task.TaskNum}】,托盘号：【{task.PalletCode}】返回参数【{JsonConvert.SerializeObject(content)}】{Environment.NewLine}{Environment.NewLine}");
                        //LogFactory.WriteError($"获取货位", $"获取货位,任务号:【{task.TaskNum}】,托盘号：【{task.PalletCode}】返回参数【{JsonConvert.SerializeObject(content)}】");

                        //// æ£€æŸ¥çŠ¶æ€å¹¶è¿”回
                        //if (!content.Status)
@@ -560,6 +566,8 @@

                    if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
                    {
                        CompletedTask(task.TaskNum);

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

@@ -752,6 +760,8 @@
                    task.Modifier = "System";
                    BaseDal.UpdateData(task);

                    content.OK(data: task);

                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)