新增历史信息，页面排序，生产时间

huanghongfeng

2024-12-09 19e5b7583a2aa1968c674b4b35f618cc6c2e29ef

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

@@ -143,23 +143,59 @@
                if (targetCodes[4] == "02")
                {

                    task = OutTaskMovelibrary(task);
                    if (task != null)
                    Dt_Task taskst = OutTaskMovelibrary(task);
                    if (taskst != null)
                    {
                        if(taskst.TaskType == (int)TaskRelocationTypeEnum.Relocation) 
                        {
                            return taskst;
                        }
                        else
                        {
                            if(taskst.TargetAddress== "R02-001-021-001-02" || taskst.TargetAddress == "R02-001-022-001-02")
                            {
                                return taskst;
                            }
                            else
                            {
                                if (OutTaskStationIsOccupied(taskst) != null)
                                {
                                    return taskst;
                                }
                            }
                                
                        }
                        
                    }
                    task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                }
                else
                {
                    if (task.TargetAddress == "R02-001-021-001-02" || task.TargetAddress == "R02-001-022-001-02")
                    {
                        return task;
                    }
                    else
                    {
                        if (OutTaskStationIsOccupied(task) != null)
                        {
                            return task;
                        }
                    }
                    
                    task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                }
                if (OutTaskStationIsOccupied(task) != null)


                /*if (OutTaskStationIsOccupied(task) != null)
                {
                    return task;
                }
                else
                {
                    List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
                    List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode, otherOutStaionCodes);

                    List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode);
                    foreach (var item in tasks)
                    {
                        if (OutTaskStationIsOccupied(task) != null)
@@ -168,9 +204,8 @@
                        }
                    }
                    //task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                }
                }*/
            }

            return task;
        }

@@ -223,10 +258,10 @@
                }
                targetCodes[4] = "01";
                string SourceAddress = string.Join("-", targetCodes); //组装浅库位地址
                Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault();
                Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault(); //找浅库位是否有任务
                if (tasks != null)
                {
                    return task;
                    return tasks;
                }
                else
                {
@@ -251,7 +286,7 @@
            if (Applyrelease(commonStackerCrane)) //读取堆垛机放货申请
            {
                Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && (task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
                {
                    IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Exists(x => x.DeviceChildCode == task.TargetAddress));
                    if (device != null)
@@ -291,7 +326,7 @@
            else
            {
                Dt_Task task = _taskService.IngStackerCraneTask2(commonStackerCrane.DeviceCode);
                if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                if (task !=null && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&(task.TargetAddress != "R02-001-021-001-02" && task.TargetAddress != "R02-001-022-001-02"))
                {
                    if (Completesignal(commonStackerCrane, task.TargetAddress))        //读取到放货完成信号
                    {
@@ -592,7 +627,14 @@
                    {
                        return true;
                    }
                   
                }
                DeviceProDTO? deviceProDTO6 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_A2in");  //空托出入库
                if (deviceProDTO6 != null)
                {
                    if (GetStacker(commonStackerCrane, deviceProDTO6.DeviceProAddress).Status)
                    {
                        return true;
                    }
                }
            }
            return false;
@@ -642,6 +684,15 @@
                if (deviceProDTO != null)
                {
                   if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                }
            }

            if (Destinationaddress == "R01-002-043-001-01")
            {
                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_A2in");
                if (deviceProDTO != null)
                {
                    if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                }
            }

@@ -709,7 +760,17 @@
                    }
                }
            }

            if (Destinationaddress == "R01-002-043-001-01")
            {
                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_A2in");
                if (deviceProDTO != null)
                {
                    if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
                    {
                        return true;
                    }
                }
            }
            return false;

        }
@@ -758,7 +819,14 @@
                    if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                }
            }

            if (Destinationaddress == "R01-002-043-001-01")
            {
                DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_A2in");
                if (deviceProDTO != null)
                {
                    if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
                }
            }
            return false;
        }

@@ -1058,7 +1126,7 @@
        {
            StackerCraneTaskCommand stackerCraneTaskCommand = new StackerCraneTaskCommand();

            stackerCraneTaskCommand.Barcode = task.PalletCode;
            stackerCraneTaskCommand.Barcode = ""; /*task.PalletCode;*/
            stackerCraneTaskCommand.TaskNum = task.TaskNum;
            stackerCraneTaskCommand.WorkType = 1;
            stackerCraneTaskCommand.TrayType = 0;