1

wangxinhui

6 小时以前 e1ffdac8c90cdc6ef6220a1442da0d5ad0241c98

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/RGVJob_BC.cs

@@ -98,27 +98,24 @@
                        ConveyorLineSignal conveyorLineSignalRead = conveyorLineInfoRead.Signal.ByteToBoolObject<ConveyorLineSignal>();

                        ConveyorLineSignal conveyorLineSignalWrite = conveyorLineInfoWrite.Signal.ByteToBoolObject<ConveyorLineSignal>();

                        //如果有退料或者入库任务进行管控
                        Dt_Task taskInControl = _taskRepository.QueryFirst(x => x.TaskType>=TaskTypeEnum.Inbound.ObjToInt() && x.WarehouseId== warehouseDevice.WarehouseId);
                        if (item.StationCode=="1511")
                        {
                            short isControl = device.GetValue<W_ConveyorLineDB, short>(W_ConveyorLineDB.Spare2, item.StationCode);
                            if (taskInControl!=null && isControl == 0)
                            {
                                device.SetValue(W_ConveyorLineDB.Spare2, 1, item.StationCode);
                                WriteDebug($"{item.StationCode}管控", $"管控控制");
                            }
                            else if (isControl==1 && taskInControl==null)
                            {
                                device.SetValue(W_ConveyorLineDB.Spare2, 0, item.StationCode);
                                WriteDebug($"{item.StationCode}管控", $"管控恢复");
                            }
                        }
                        if (item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt())
                        {
                            //if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode) && conveyorLineInfoRead.TaskNum == 0)//入库
                            //{
                            //    List<string> stations = _routerExtension.GetEndPoint(item.StationCode, TaskTypeEnum.Inbound.ObjToInt()).Select(x => x.NextPosi).ToList();
                            //    WebResponseContent responseContent = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode,  conveyorLineInfoRead.Spare2, stations);
                            //    if (responseContent.Status)
                            //    {
                            //        Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == conveyorLineInfoRead.Barcode && x.CurrentAddress == item.StationCode && x.DeviceCode == device.DeviceCode && x.TaskState == TaskStatusEnum.New.ObjToInt());
                            //        if (task != null)
                            //        {
                            //            device.SetValue(W_ConveyorLineDB.TaskNum, task.TaskNum, item.StationCode);
                            //            device.SetValue(W_ConveyorLineDB.StartPos, task.CurrentAddress, item.StationCode);
                            //            device.SetValue(W_ConveyorLineDB.Spare1, ConveyorWorkTypeEnum.Inbound.ObjToInt(), item.StationCode);
                            //            device.SetValue(W_ConveyorLineDB.EndPos, task.NextAddress, item.StationCode);
                            //            device.SetValue(W_ConveyorLineDB.ACK, true, item.StationCode);
                            //            _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
                            //        }
                            //    }
                            //}

                            if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && !string.IsNullOrEmpty(conveyorLineInfoRead.Barcode) && conveyorLineInfoRead.TaskNum == 0)//入库
                            {
@@ -137,7 +134,7 @@
                                    }
                                }
                            }
                            else if (conveyorLineSignalRead.STB /*&& conveyorLineStatus.Online && conveyorLineStatus.Goods && !conveyorLineStatus.Alarm*/ && !conveyorLineSignalWrite.ACK && conveyorLineInfoRead.TaskNum > 0)//出库
                            else if (conveyorLineSignalRead.STB && !conveyorLineSignalWrite.ACK && conveyorLineInfoRead.TaskNum > 0)//出库
                            {
                                WriteDebug(device.DeviceName, $"任务完成,任务号:{conveyorLineInfoRead.TaskNum}");
                                _taskService.TaskCompleted(conveyorLineInfoRead.TaskNum);
@@ -153,6 +150,51 @@
                                device.SetValue(W_ConveyorLineDB.ACK, false, item.StationCode);
                            }
                        }
                        //允许放行一号开料口出库任务
                        bool outAllowLine1 = device.Communicator.Read<bool>("DB14.4.6");
                        if (outAllowLine1)
                        {
                            Dt_Task taskExcuting = _taskRepository.QueryFirst(x => x.WarehouseId== warehouseDevice.WarehouseId && (x.TargetAddress== "SCUTL-001" || x.TargetAddress == "1101")
                            && (x.TaskState==TaskStatusEnum.SC_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.SC_Executing.ObjToInt() 
                            || x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()));
                            Dt_Task? taskExecute = _taskRepository.QueryData(x => x.WarehouseId == warehouseDevice.WarehouseId && x.TargetAddress == "SCUTL-001"
                            && x.TaskState==TaskStatusEnum.MesPending.ObjToInt()).OrderByDescending(x=>x.Grade).ThenBy(x=>x.TaskNum).ThenBy(x=>x.CreateDate).FirstOrDefault();
                            if (taskExcuting == null && taskExecute!=null)
                            {
                                _taskService.UpdateTask(taskExecute, TaskStatusEnum.SC_Execute);
                                WriteDebug($"一号开料口放行任务", $"任务号{taskExecute.TaskNum}");
                            }
                        }
                        //允许放行二号开料口出库任务
                        bool outAllowLine2 = device.Communicator.Read<bool>("DB14.12.6");
                        if (outAllowLine2)
                        {
                            Dt_Task taskExcuting = _taskRepository.QueryFirst(x => x.WarehouseId == warehouseDevice.WarehouseId && (x.TargetAddress == "SCUTL-002" || x.TargetAddress == "1103")
                            && (x.TaskState == TaskStatusEnum.SC_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.SC_Executing.ObjToInt()
                            || x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()));
                            Dt_Task? taskExecute = _taskRepository.QueryData(x => x.WarehouseId == warehouseDevice.WarehouseId && x.TargetAddress == "SCUTL-002"
                            && x.TaskState == TaskStatusEnum.MesPending.ObjToInt()).OrderByDescending(x => x.Grade).ThenBy(x => x.TaskNum).ThenBy(x => x.CreateDate).FirstOrDefault();
                            if (taskExcuting == null && taskExecute != null)
                            {
                                _taskService.UpdateTask(taskExecute, TaskStatusEnum.SC_Execute);
                                WriteDebug($"二号开料口放行任务", $"任务号{taskExecute.TaskNum}");
                            }
                        }
                        //允许放行手动开料口出库任务
                        bool outAllowMusual = device.Communicator.Read<bool>("DB14.4.7");
                        if (outAllowMusual)
                        {
                            Dt_Task taskExcuting = _taskRepository.QueryFirst(x => x.WarehouseId == warehouseDevice.WarehouseId && (x.TargetAddress == "SCUTL_04-001" || x.TargetAddress == "1102")
                            && (x.TaskState == TaskStatusEnum.SC_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.SC_Executing.ObjToInt()
                            || x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt()));
                            Dt_Task? taskExecute = _taskRepository.QueryData(x => x.WarehouseId == warehouseDevice.WarehouseId && x.TargetAddress == "SCUTL_04-001"
                            && x.TaskState == TaskStatusEnum.MesPending.ObjToInt()).OrderByDescending(x => x.Grade).ThenBy(x => x.TaskNum).ThenBy(x => x.CreateDate).FirstOrDefault();
                            if (taskExcuting == null && taskExecute != null)
                            {
                                _taskService.UpdateTask(taskExecute, TaskStatusEnum.SC_Execute);
                                WriteDebug($"手动开料口放行任务", $"任务号{taskExecute.TaskNum}");
                            }
                        }
                    }
                    else
                    {