1

dengjunjie

4 天以前 681d093f9ea16ab2d480d77e6b04b197e506ff60

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -50,15 +50,24 @@
                        Dt_Task? task = GetTask(speStackerCrane);
                        if (task != null)
                        {
                            StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                            if (stackerCraneTaskCommand != null)
                            bool sendFlag = true;
                            //if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
                            //{
                            //    //向WMS申请出入库口是否有空托盘
                            //    sendFlag = false;
                            //}
                            if (sendFlag)
                            {
                                bool sendFlag = getStackerObject.SendCommand(stackerCraneTaskCommand);
                                if (sendFlag)
                                StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                                if (stackerCraneTaskCommand != null)
                                {
                                    speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 1);//启动命令
                                    speStackerCrane.LastTaskType = task.TaskType;
                                    _taskService.UpdateTaskStatusToNext(task.TaskNum);
                                    sendFlag = getStackerObject.SendCommand(stackerCraneTaskCommand);
                                    if (sendFlag)
                                    {
                                        speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 1);//启动命令
                                        speStackerCrane.LastTaskType = task.TaskType;
                                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
                                    }
                                }
                            }
                        }
@@ -85,7 +94,7 @@
                if (speStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CommandSend) != 2)
                {
                    speStackerCrane.SetValue(StackerCraneDBName.CommandSend, 2);
                    _taskService.StackCraneTaskCompleted(e.TaskNum);
                    _taskService.StackCraneTaskCompleted(e.TaskNum, "堆垛机");
                }
            }
        }
@@ -98,12 +107,18 @@
        private Dt_Task? GetTask(SpeStackerCrane speStackerCrane)
        {
            Dt_Task? task;
            string DeviceCode = speStackerCrane.DeviceCode.Contains("CP") ? "CP" : "FL";
            if (speStackerCrane.LastTaskType == null)
            {
                task = _taskService.QueryStackerCraneTask(speStackerCrane.DeviceCode);
                task = _taskService.QueryStackerCraneTask(DeviceCode);
            }
            else
            {
                if (speStackerCrane.LastTaskType == TaskTypeEnum.Relocation.ObjToInt())
                {
                    task = _taskService.QueryStackerCraneTask(DeviceCode);
                    if (task != null) return task;
                }
                bool flag = speStackerCrane.LastTaskType == TaskTypeEnum.Inbound.ObjToInt() || speStackerCrane.LastTaskType == TaskTypeEnum.PalletInbound.ObjToInt();
                if (flag == false)
                {