更新

Admin

9 天以前 96a77e69b0577c50adfaacd5fd8b89009242d3bd

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -171,12 +171,10 @@
                        task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                        task.Roadway = task.Roadway == "1" ? task.Roadway = "SC01" : task.Roadway = "SC02";
                        BaseDal.AddData(task);
                        return content;
                        return content.OK("成功入库申请wms");
                    }
                }

                
                return content = WebResponseContent.Instance.Error();
                return content;
            }
            catch (Exception ex)
            {
@@ -244,11 +242,11 @@
                        WriteLog.GetLog("PLC日志出库日志").Write($"空托出库失败，详情：{content.Message}", "需要空托");
                    }
                }
                return content = WebResponseContent.Instance.Error();
                return content;
            }
            catch (Exception ex)
            {
                return content = WebResponseContent.Instance.Error(ex.Message);
                return content.Error(ex.Message);
            }
        }

@@ -598,19 +596,6 @@
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                if(task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    if (task.TaskState != (int)TaskOutStatusEnum.ResRestNet)
                    {
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }
                    task.TaskState = (int)TaskOutStatusEnum.ResRest;    //下发移库任务
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
                    BaseDal.UpdateData(task);
                }

                return UpdateTaskStatusToNext(task);
            }
            catch (Exception ex)
@@ -638,13 +623,10 @@
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();

                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
                    task.Dispatchertime = DateTime.Now;
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                {
@@ -653,34 +635,17 @@
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    if (task.TaskState == (int)TaskRelocationTypeEnum.Relocation)
                    {
                        Random random = new Random();
                        task.CurrentAddress = task.NextAddress;
                        task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}";
                        task.TargetAddress = task.NextAddress;
                    }
                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
                    task.TaskState = (int)TaskInStatusEnum.SC_InExecuting;
                    task.Dispatchertime = DateTime.Now;
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    if (task.TaskState <= (int)TaskRelocationStatusEnum.SC_RelocationFinish)
                    if (task.TaskState != (int)TaskOutStatusEnum.ResRestNet)
                    {
                        
                        return content = WebResponseContent.Instance.Error($"该任务状态不可跳转到下一步,任务号:【{task.TaskNum}】,任务状态:【{task.TaskState}】");
                    }

                    int nextStatus = (int)TaskRelocationStatusEnum.SC_RelocationExecuting;
                    task.TaskState = nextStatus;
                    if (task.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationExecuting)
                    {
                        task.Dispatchertime = DateTime.Now;
                    }
                    task.TaskState = (int)TaskOutStatusEnum.ResRest;    //下发移库任务
                }
                else
                {
@@ -986,6 +951,16 @@
            }
        }

        public bool ObtainOutTaskInfo()
        {
            Dt_Task task = BaseDal.QueryData(x => x.Roadway == "SC01" && x.TargetAddress == "R01-002-044-001-01").FirstOrDefault();
            if (task != null)
            {
                return true;
            }
            return false;
        }

        public WebResponseContent ReceiveWCSTask(int tasknum)
        {
            Dt_Task tasks = BaseDal.QueryFirst(x => x.TaskNum == tasknum);