1

dengjunjie

4 天以前 681d093f9ea16ab2d480d77e6b04b197e506ff60

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -51,12 +51,12 @@
                        if (task != null)
                        {
                            bool sendFlag = true;
                            if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
                            {
                                //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
                                sendFlag = false;
                            }
                            if(sendFlag)
                            //if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
                            //{
                            //    //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
                            //    sendFlag = false;
                            //}
                            if (sendFlag)
                            {
                                StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
                                if (stackerCraneTaskCommand != null)
@@ -107,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)
                {